Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(28)

Issue 1514853003: Revert of Removing references to webrtc::PortAllocatorFactoryInterface. (Closed)

Created:
5 years ago by hans
Modified:
5 years ago
CC:
chromium-reviews, mlamouri+watch-content_chromium.org, extensions-reviews_chromium.org, chromoting-reviews_chromium.org, posciak+watch_chromium.org, jam, mcasas+watch_chromium.org, feature-media-reviews_chromium.org, darin-cc_chromium.org, mkwst+moarreviews-renderer_chromium.org, chromium-apps-reviews_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Revert of Removing references to webrtc::PortAllocatorFactoryInterface. (patchset #6 id:100001 of https://codereview.chromium.org/1500663003/ ) Reason for revert: Broke the build: ../../remoting/host/remoting_me2me_host.cc:1505:9: error: no viable conversion from 'scoped_ptr<remoting::protocol::PortAllocatorFactory>' to 'rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface>' port_allocator_factory = protocol::ChromiumPortAllocatorFactory::Create( ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../../third_party/webrtc/base/scoped_ref_ptr.h:76:3: note: candidate constructor not viable: no known conversion from 'scoped_ptr<remoting::protocol::PortAllocatorFactory>' to 'webrtc::PortAllocatorFactoryInterface *' for 1st argument scoped_refptr(T* p) : ptr_(p) { ^ ../../third_party/webrtc/base/scoped_ref_ptr.h:81:3: note: candidate constructor not viable: no known conversion from 'scoped_ptr<remoting::protocol::PortAllocatorFactory>' to 'const scoped_refptr<webrtc::PortAllocatorFactoryInterface> &' for 1st argument scoped_refptr(const scoped_refptr<T>& r) : ptr_(r.ptr_) { ^ ../../third_party/webrtc/base/scoped_ref_ptr.h:87:3: note: candidate template ignored: could not match 'scoped_refptr' against 'scoped_ptr' scoped_refptr(const scoped_refptr<U>& r) : ptr_(r.get()) { ^ ../../base/memory/scoped_ptr.h:378:3: note: candidate function operator Testable() const { ^ 1 error generated. From https://build.chromium.org/p/chromium.linux/builders/Linux%20Builder%20%28dbg%29/builds/97032/ Original issue's description: > Removing references to webrtc::PortAllocatorFactoryInterface. > > Now using a new CreatePeerConnection method that takes a > PortAllocator as input. This removes the need for some > boilerplate code and code duplication between webrtc and chromium. > It also fixes an issue with TURN candidate priorities. > > BUG=webrtc:5209 > > Committed: https://crrev.com/ad868b5edf13e869e835b847078b4dcc8aa7cd0d > Cr-Commit-Position: refs/heads/master@{#364544} TBR=sergeyu@chromium.org,deadbeef@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:5209 Committed: https://crrev.com/ed698a70b951776aac2af82e3d7c73c6d201e1b8 Cr-Commit-Position: refs/heads/master@{#364556}

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+273 lines, -97 lines) Patch
M content/renderer/media/webrtc/peer_connection_dependency_factory.cc View 2 chunks +87 lines, -22 lines 0 comments Download
M content/renderer/p2p/filtering_network_manager.h View 1 chunk +1 line, -2 lines 0 comments Download
M content/renderer/p2p/port_allocator.h View 3 chunks +47 lines, -0 lines 0 comments Download
M content/renderer/p2p/port_allocator.cc View 3 chunks +71 lines, -4 lines 0 comments Download
M remoting/host/cast_extension_session.h View 1 chunk +1 line, -1 line 0 comments Download
M remoting/host/cast_extension_session.cc View 4 chunks +15 lines, -14 lines 0 comments Download
M remoting/protocol/chromium_port_allocator.h View 1 chunk +4 lines, -1 line 0 comments Download
M remoting/protocol/chromium_port_allocator_factory.h View 2 chunks +8 lines, -6 lines 0 comments Download
M remoting/protocol/chromium_port_allocator_factory.cc View 1 chunk +20 lines, -4 lines 0 comments Download
D remoting/protocol/port_allocator_factory.h View 1 chunk +0 lines, -25 lines 0 comments Download
M remoting/protocol/webrtc_transport.h View 5 chunks +8 lines, -6 lines 0 comments Download
M remoting/protocol/webrtc_transport.cc View 3 chunks +11 lines, -11 lines 0 comments Download
M remoting/remoting_srcs.gypi View 1 chunk +0 lines, -1 line 0 comments Download

Messages

Total messages: 6 (2 generated)
hans
Created Revert of Removing references to webrtc::PortAllocatorFactoryInterface.
5 years ago (2015-12-11 01:13:18 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1514853003/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1514853003/1
5 years ago (2015-12-11 01:13:37 UTC) #2
commit-bot: I haz the power
Committed patchset #1 (id:1)
5 years ago (2015-12-11 01:16:00 UTC) #4
commit-bot: I haz the power
5 years ago (2015-12-11 01:17:12 UTC) #6
Message was sent while issue was closed.
Patchset 1 (id:??) landed as
https://crrev.com/ed698a70b951776aac2af82e3d7c73c6d201e1b8
Cr-Commit-Position: refs/heads/master@{#364556}

Powered by Google App Engine
This is Rietveld 408576698