)]}'
{
  "commit": "6f59a4fc4f2eb8fad0fcb759fe254019ee263bf2",
  "tree": "34b15430f1c2bba94c8242e9ae309708f4a0dedc",
  "parents": [
    "916c76eaadc519b6278899736504cad47c8ab50b"
  ],
  "author": {
    "name": "tommi",
    "email": "tommi@webrtc.org",
    "time": "Fri Mar 11 22:05:09 2016"
  },
  "committer": {
    "name": "Commit bot",
    "email": "commit-bot@chromium.org",
    "time": "Fri Mar 11 22:05:15 2016"
  },
  "message": "Revert of Remove candidates when doing continual gathering (patchset #15 id:560001 of https://codereview.webrtc.org/1648813004/ )\n\nReason for revert:\nBreaks the build.  Suggest we reland with a default implementation of the new method, update Chrome, land a change that changes |{}| -\u003e |\u003d 0;|\n\nHere\u0027s the error:\n\nFAILED: /b/build/goma/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/content/renderer/media/webrtc/test_support_content.mock_peer_connection_dependency_factory.o.d -DV8_DEPRECATION_WARNINGS -DCLD_VERSION\u003d2 -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE\u003d0 -DCHROMIUM_BUILD -DCR_CLANG_REVISION\u003d262839-1 -DUSE_LIBJPEG_TURBO\u003d1 -DENABLE_WEBRTC\u003d1 -DENABLE_MEDIA_ROUTER\u003d1 -DUSE_PROPRIETARY_CODECS -DENABLE_PEPPER_CDMS -DENABLE_CONFIGURATION_POLICY -DENABLE_NOTIFICATIONS -DENABLE_TOPCHROME_MD\u003d1 -DDCHECK_ALWAYS_ON\u003d1 -DFIELDTRIAL_TESTING_ENABLED -DENABLE_TASK_MANAGER\u003d1 -DENABLE_EXTENSIONS\u003d1 -DENABLE_PDF\u003d1 -DENABLE_PLUGIN_INSTALLATION\u003d1 -DENABLE_PLUGINS\u003d1 -DENABLE_SESSION_SERVICE\u003d1 -DENABLE_THEMES\u003d1 -DENABLE_AUTOFILL_DIALOG\u003d1 -DENABLE_PRINTING\u003d1 -DENABLE_BASIC_PRINTING\u003d1 -DENABLE_PRINT_PREVIEW\u003d1 -DENABLE_SPELLCHECK\u003d1 -DUSE_BROWSER_SPELLCHECKER\u003d1 -DENABLE_CAPTIVE_PORTAL_DETECTION\u003d1 -DENABLE_APP_LIST\u003d1 -DENABLE_SETTINGS_APP\u003d1 -DENABLE_SUPERVISED_USERS\u003d1 -DENABLE_SERVICE_DISCOVERY\u003d1 -DV8_USE_EXTERNAL_STARTUP_DATA -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DMOJO_USE_SYSTEM_IMPL -DGTEST_HAS_POSIX_RE\u003d0 -DGTEST_LANG_CXX11\u003d0 -DSK_SUPPORT_GPU\u003d1 -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DUNIT_TEST -DGTEST_HAS_RTTI\u003d0 -DU_USING_ICU_NAMESPACE\u003d0 -DU_ENABLE_DYLOAD\u003d0 -DU_STATIC_IMPLEMENTATION -DPROTOBUF_USE_DLLS -DGOOGLE_PROTOBUF_NO_RTTI -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DFEATURE_ENABLE_SSL -DFEATURE_ENABLE_VOICEMAIL -DEXPAT_RELATIVE_PATH -DGTEST_RELATIVE_PATH -DNO_MAIN_THREAD_WRAPPING -DNO_SOUND_SYSTEM -DOSX -DWEBRTC_MAC -DWEBRTC_POSIX -DXML_STATIC -DWEBRTC_CHROMIUM_BUILD -DUSE_LIBPCI\u003d1 -DUSE_OPENSSL\u003d1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED\u003d0 -D_FORTIFY_SOURCE\u003d2 -Igen -I../.. -I../../third_party/khronos -I../../gpu -I../../skia/config -Igen/angle -I../../third_party/WebKit/Source -I../../third_party/skia/include/core -I../../third_party/skia/include/effects -I../../third_party/skia/include/pdf -I../../third_party/skia/include/gpu -I../../third_party/skia/include/lazy -I../../third_party/skia/include/pathops -I../../third_party/skia/include/pipe -I../../third_party/skia/include/ports -I../../third_party/skia/include/utils -I../../third_party/skia/include/utils/mac -I../../skia/ext -I../../testing/gmock/include -I../../testing/gtest/include -I../../third_party/icu/source/i18n -I../../third_party/icu/source/common -Igen/ui/resources -Igen/protoc_out -I../../third_party/protobuf -I../../third_party/protobuf/src -I../../third_party/WebKit -I../../ipc -I../../third_party/opus/src/include -I../../third_party/WebKit -I../../third_party/npapi -I../../third_party/npapi/bindings -I../../third_party/libpng -I../../third_party/zlib -I../../third_party/libwebp -I../../third_party/ots/include -I../../third_party/qcms/src -I../../third_party/iccjpeg -I../../third_party/libjpeg_turbo -I../../v8/include -I../../third_party/webrtc_overrides -I../../third_party/libjingle/overrides -I../../third_party/libjingle/source -I../../third_party -I../../third_party/expat/files/lib -I../../third_party/libvpx/source/libvpx -isysroot /Applications/Xcode5.1.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk -O2 -gdwarf-2 -fvisibility\u003dhidden -Werror -mmacosx-version-min\u003d10.6 -arch x86_64 -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-selector-type-mismatch -Wpartial-availability -Wheader-hygiene -Wno-char-subscripts -Wno-unneeded-internal-declaration -Wno-covered-switch-default -Wstring-conversion -Wno-c++11-narrowing -Wno-deprecated-register -Wno-inconsistent-missing-override -Wno-shift-negative-value -std\u003dc++11 -stdlib\u003dlibc++ -fno-rtti -fno-exceptions -fvisibility-inlines-hidden -fno-threadsafe-statics -Xclang -load -Xclang /b/build/slave/Mac_Builder/build/src/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib -Xclang -add-plugin -Xclang find-bad-constructs -Xclang -plugin-arg-find-bad-constructs -Xclang check-templates -Xclang -plugin-arg-find-bad-constructs -Xclang follow-macro-expansion -fcolor-diagnostics -fno-strict-aliasing  -c ../../content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc -o obj/content/renderer/media/webrtc/test_support_content.mock_peer_connection_dependency_factory.o\n../../content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc:404:14: error: allocating an object of abstract class type \u0027content::MockSessionDescription\u0027\n  return new MockSessionDescription(type, sdp);\n             ^\n../../third_party/webrtc/api/jsep.h:100:18: note: unimplemented pure virtual method \u0027RemoveCandidates\u0027 in \u0027MockSessionDescription\u0027\n  virtual size_t RemoveCandidates(\n                 ^\n1 error generated.\nninja: build stopped: subcommand failed.\n\nOriginal issue\u0027s description:\n\u003e When doing candidate re-gathering in the same generation, Remove the existing local candidate on the same network\n\u003e and signaling the remote side to remove its remote candidate by setting the candidate priority to 0.\n\u003e\n\u003e BUG\u003d\n\u003e\n\u003e Committed: https://crrev.com/84430da6817ce69c53bfad088be5c9df8b420f01\n\u003e Cr-Commit-Position: refs/heads/master@{#11958}\n\nTBR\u003dpthatcher@webrtc.org,deadbeef@webrtc.org,glaznev@webrtc.org,honghaiz@webrtc.org\n# Skipping CQ checks because original CL landed less than 1 days ago.\nNOPRESUBMIT\u003dtrue\nNOTREECHECKS\u003dtrue\nNOTRY\u003dtrue\nBUG\u003d\n\nReview URL: https://codereview.webrtc.org/1785613011\n\nCr-Commit-Position: refs/heads/master@{#11960}\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "ff98d7d96afc6e9bdac77efc6cf432e8bfe9d29d",
      "old_mode": 33188,
      "old_path": "webrtc/api/androidtests/src/org/webrtc/PeerConnectionTest.java",
      "new_id": "bbaa15287e82330c264791bd1286896ee72ab52b",
      "new_mode": 33188,
      "new_path": "webrtc/api/androidtests/src/org/webrtc/PeerConnectionTest.java"
    },
    {
      "type": "modify",
      "old_id": "6482134df607b18fbf8ff14c9ee0eb31d3dadc14",
      "old_mode": 33188,
      "old_path": "webrtc/api/java/jni/peerconnection_jni.cc",
      "new_id": "7a95737c9ab17c0353fb7fc5c0fff25f998bc8ad",
      "new_mode": 33188,
      "new_path": "webrtc/api/java/jni/peerconnection_jni.cc"
    },
    {
      "type": "modify",
      "old_id": "5f526196ee5a4ec6a2647bda0644e56c0a16c5b3",
      "old_mode": 33188,
      "old_path": "webrtc/api/java/src/org/webrtc/PeerConnection.java",
      "new_id": "3c9fa0ee21f248a87fc4f3e0ac860be6e733e8fc",
      "new_mode": 33188,
      "new_path": "webrtc/api/java/src/org/webrtc/PeerConnection.java"
    },
    {
      "type": "modify",
      "old_id": "6ac1f2d8d1b65ee6dac1b95f7268c077c20a3d65",
      "old_mode": 33188,
      "old_path": "webrtc/api/jsep.h",
      "new_id": "0673ce128e053098bbc87c7ee264ce88d6a01ccf",
      "new_mode": 33188,
      "new_path": "webrtc/api/jsep.h"
    },
    {
      "type": "modify",
      "old_id": "cced1b4d6a51b68c657ada0d5b29189cd7104174",
      "old_mode": 33188,
      "old_path": "webrtc/api/jsepicecandidate.cc",
      "new_id": "2aabcb83498ead96000f9624b423a21102516bfb",
      "new_mode": 33188,
      "new_path": "webrtc/api/jsepicecandidate.cc"
    },
    {
      "type": "modify",
      "old_id": "7e9500bceac59806d98cb2a62cbe5b084b2869ec",
      "old_mode": 33188,
      "old_path": "webrtc/api/jsepicecandidate.h",
      "new_id": "529b2a7756de8ea0ebf33e714fb6e63eb04176a6",
      "new_mode": 33188,
      "new_path": "webrtc/api/jsepicecandidate.h"
    },
    {
      "type": "modify",
      "old_id": "eb776c86fa7d9bfd3755adac93b4844ad34456d2",
      "old_mode": 33188,
      "old_path": "webrtc/api/jsepsessiondescription.cc",
      "new_id": "b47114b9bcd052979f13a19bdea35d3faae6efc5",
      "new_mode": 33188,
      "new_path": "webrtc/api/jsepsessiondescription.cc"
    },
    {
      "type": "modify",
      "old_id": "9a0d8732044104990006588dd293cc1d23c68b61",
      "old_mode": 33188,
      "old_path": "webrtc/api/jsepsessiondescription.h",
      "new_id": "244ee1921277656b64e9361f7f1db1bd87964b13",
      "new_mode": 33188,
      "new_path": "webrtc/api/jsepsessiondescription.h"
    },
    {
      "type": "modify",
      "old_id": "3d8751373116c42bcdcf8fece530800719e6d880",
      "old_mode": 33188,
      "old_path": "webrtc/api/jsepsessiondescription_unittest.cc",
      "new_id": "7868beaad36ac3a96a16f72f18cd086598200d03",
      "new_mode": 33188,
      "new_path": "webrtc/api/jsepsessiondescription_unittest.cc"
    },
    {
      "type": "modify",
      "old_id": "54e76d46c95bf20329ee93f6e903aa77fafa8ce7",
      "old_mode": 33188,
      "old_path": "webrtc/api/peerconnection.cc",
      "new_id": "e4ab40e3b251524fb38cf13523a3eb21c6173d77",
      "new_mode": 33188,
      "new_path": "webrtc/api/peerconnection.cc"
    },
    {
      "type": "modify",
      "old_id": "d715ecdf73d45574a1383a2c66c8f6e5fcaa8af9",
      "old_mode": 33188,
      "old_path": "webrtc/api/peerconnection.h",
      "new_id": "3b0d558cfc604db38ba38a62754ed2ada6ce70df",
      "new_mode": 33188,
      "new_path": "webrtc/api/peerconnection.h"
    },
    {
      "type": "modify",
      "old_id": "22109c4088e9415f0f55015ee95b9747dea24b4d",
      "old_mode": 33188,
      "old_path": "webrtc/api/peerconnectioninterface.h",
      "new_id": "f6c8cbaf00bd0d93b2b7c60cd13506928b9a9de5",
      "new_mode": 33188,
      "new_path": "webrtc/api/peerconnectioninterface.h"
    },
    {
      "type": "modify",
      "old_id": "1183e6191034534154a24547b1976f7981c21c07",
      "old_mode": 33188,
      "old_path": "webrtc/api/peerconnectionproxy.h",
      "new_id": "e47bc965a329a6478976493337781134fd78ff96",
      "new_mode": 33188,
      "new_path": "webrtc/api/peerconnectionproxy.h"
    },
    {
      "type": "modify",
      "old_id": "4a296d9ce2e28a274377e3ca79e727f45c5b6e91",
      "old_mode": 33188,
      "old_path": "webrtc/api/webrtcsdp.cc",
      "new_id": "54bb0599d4e57367b3202759f84d3195cf72bab8",
      "new_mode": 33188,
      "new_path": "webrtc/api/webrtcsdp.cc"
    },
    {
      "type": "modify",
      "old_id": "e7fdb34d01e37f17510654a6ed2e9d0906b2c8ba",
      "old_mode": 33188,
      "old_path": "webrtc/api/webrtcsdp.h",
      "new_id": "2b22b6249f1b10692642929fabee7c816f417882",
      "new_mode": 33188,
      "new_path": "webrtc/api/webrtcsdp.h"
    },
    {
      "type": "modify",
      "old_id": "08a46ad27677fcc69cd953e068c0cbef6566d7a1",
      "old_mode": 33188,
      "old_path": "webrtc/api/webrtcsession.cc",
      "new_id": "2f3c911454d440d448f5f4d6c68a498a7ef246fd",
      "new_mode": 33188,
      "new_path": "webrtc/api/webrtcsession.cc"
    },
    {
      "type": "modify",
      "old_id": "9495116471e89c5215e263e1d0b945906b4ffc10",
      "old_mode": 33188,
      "old_path": "webrtc/api/webrtcsession.h",
      "new_id": "27472c9136ccb1d02fbfa3f10397ccce3d5deb97",
      "new_mode": 33188,
      "new_path": "webrtc/api/webrtcsession.h"
    },
    {
      "type": "modify",
      "old_id": "c0fff5251301b58a09508ef03e31f96289f9c57d",
      "old_mode": 33188,
      "old_path": "webrtc/api/webrtcsession_unittest.cc",
      "new_id": "2c9a99b5e08a247cea0eaf567f30a9e65b464899",
      "new_mode": 33188,
      "new_path": "webrtc/api/webrtcsession_unittest.cc"
    },
    {
      "type": "modify",
      "old_id": "f9cb67bd02a01ad25e7b743cec910c3cc96239eb",
      "old_mode": 33188,
      "old_path": "webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCClient.java",
      "new_id": "195446ab5faf5c12f891de5178b91cc386e3027b",
      "new_mode": 33188,
      "new_path": "webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCClient.java"
    },
    {
      "type": "modify",
      "old_id": "b50935b809d19edc4db5d9c6ca51ccac082bab65",
      "old_mode": 33188,
      "old_path": "webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java",
      "new_id": "e2f130663bf77425414eb9fb5a3734fe991ebd92",
      "new_mode": 33188,
      "new_path": "webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java"
    },
    {
      "type": "modify",
      "old_id": "ecd0da4c8606e2a707e25edba65bcf72d5339650",
      "old_mode": 33188,
      "old_path": "webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java",
      "new_id": "eb4d95906795f37a0ceb999185b6b78994826185",
      "new_mode": 33188,
      "new_path": "webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java"
    },
    {
      "type": "modify",
      "old_id": "258b22f97397fb4a7cc082e07ca080e657709bc1",
      "old_mode": 33188,
      "old_path": "webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java",
      "new_id": "ca319abde29eb7c2a6125ef04aaaf8758d28296e",
      "new_mode": 33188,
      "new_path": "webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java"
    },
    {
      "type": "modify",
      "old_id": "ca7c2f937f78163be2ac6def7503a6c6fc659328",
      "old_mode": 33188,
      "old_path": "webrtc/examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java",
      "new_id": "08f5b91d231a24227e519750ad2f761d60f4a98f",
      "new_mode": 33188,
      "new_path": "webrtc/examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java"
    },
    {
      "type": "modify",
      "old_id": "11481cdb05a972db4237d3ef961cea6b0bc7e066",
      "old_mode": 33188,
      "old_path": "webrtc/p2p/base/candidate.h",
      "new_id": "afea2a21c7b7f8b8530951a0339c7fc07bbb931c",
      "new_mode": 33188,
      "new_path": "webrtc/p2p/base/candidate.h"
    },
    {
      "type": "modify",
      "old_id": "bbf3e5c484b0302672ea889665ec4ec0ac285134",
      "old_mode": 33188,
      "old_path": "webrtc/p2p/base/dtlstransportchannel.cc",
      "new_id": "2185fb3aad7eb1d4947a36e64bdfe44367007246",
      "new_mode": 33188,
      "new_path": "webrtc/p2p/base/dtlstransportchannel.cc"
    },
    {
      "type": "modify",
      "old_id": "a58b1a0f6b8de695cbe1ce5c5192b50a74f8ccf4",
      "old_mode": 33188,
      "old_path": "webrtc/p2p/base/dtlstransportchannel.h",
      "new_id": "ad30441a151f09be87feda07742438d1589572a4",
      "new_mode": 33188,
      "new_path": "webrtc/p2p/base/dtlstransportchannel.h"
    },
    {
      "type": "modify",
      "old_id": "ae5e86669acdd9027a9e61acffa5e39ecba4bf85",
      "old_mode": 33188,
      "old_path": "webrtc/p2p/base/faketransportcontroller.h",
      "new_id": "c5e2afea54fdb4e747f5680f88e561547eef03dd",
      "new_mode": 33188,
      "new_path": "webrtc/p2p/base/faketransportcontroller.h"
    },
    {
      "type": "modify",
      "old_id": "cdfcf956434723436a355032f3704f53b755de74",
      "old_mode": 33188,
      "old_path": "webrtc/p2p/base/p2ptransportchannel.cc",
      "new_id": "b21d584bf8930d0d3acd47a37d4c77649bf3da49",
      "new_mode": 33188,
      "new_path": "webrtc/p2p/base/p2ptransportchannel.cc"
    },
    {
      "type": "modify",
      "old_id": "b86389a0bd5fa31b9c42c1e646addf2620b08e2c",
      "old_mode": 33188,
      "old_path": "webrtc/p2p/base/p2ptransportchannel.h",
      "new_id": "3ca25d4cba1425bd5a379c7c5f8b10e964e23e51",
      "new_mode": 33188,
      "new_path": "webrtc/p2p/base/p2ptransportchannel.h"
    },
    {
      "type": "modify",
      "old_id": "e083c33f4d255cefc10e5257f4c39e52ce291d79",
      "old_mode": 33188,
      "old_path": "webrtc/p2p/base/p2ptransportchannel_unittest.cc",
      "new_id": "c54f054fd844a9167efaa5e9c8a2742b4f44a172",
      "new_mode": 33188,
      "new_path": "webrtc/p2p/base/p2ptransportchannel_unittest.cc"
    },
    {
      "type": "modify",
      "old_id": "b8d98100cf3af1f8b93b98e0362c15132ece9cd2",
      "old_mode": 33188,
      "old_path": "webrtc/p2p/base/transport.cc",
      "new_id": "17d05adc23216ecf5b5644a55da2dfa346c414e2",
      "new_mode": 33188,
      "new_path": "webrtc/p2p/base/transport.cc"
    },
    {
      "type": "modify",
      "old_id": "66e300a1544be1117865471492fe7b8d13601a7a",
      "old_mode": 33188,
      "old_path": "webrtc/p2p/base/transport.h",
      "new_id": "84581c8e7b71c4169f38e21a7b17517407bf3abc",
      "new_mode": 33188,
      "new_path": "webrtc/p2p/base/transport.h"
    },
    {
      "type": "modify",
      "old_id": "904ebf563fd565885d37957187d81a1ec10fcdb9",
      "old_mode": 33188,
      "old_path": "webrtc/p2p/base/transportchannelimpl.h",
      "new_id": "1fa088a30dd928658b26685e3d0b97d0f960e41e",
      "new_mode": 33188,
      "new_path": "webrtc/p2p/base/transportchannelimpl.h"
    },
    {
      "type": "modify",
      "old_id": "128d2fc656406d75b7b094baf1e8a57cd32513e1",
      "old_mode": 33188,
      "old_path": "webrtc/p2p/base/transportcontroller.cc",
      "new_id": "053388eeb8130d30fec9a6fb5a21e94ec54a8b0a",
      "new_mode": 33188,
      "new_path": "webrtc/p2p/base/transportcontroller.cc"
    },
    {
      "type": "modify",
      "old_id": "ed7216033b429d91625fd16a3c86d3a55cf9722f",
      "old_mode": 33188,
      "old_path": "webrtc/p2p/base/transportcontroller.h",
      "new_id": "450e6b391fa56add9bba368a020f8d7f3e5580d0",
      "new_mode": 33188,
      "new_path": "webrtc/p2p/base/transportcontroller.h"
    }
  ]
}
