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

Unified Diff: chrome/browser/devtools/device/devtools_android_bridge.cc

Issue 1560583002: DevTools: remove experimental webrtc-based remote debugging device provider. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more tests/gyp removals Created 4 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/devtools/device/devtools_android_bridge.cc
diff --git a/chrome/browser/devtools/device/devtools_android_bridge.cc b/chrome/browser/devtools/device/devtools_android_bridge.cc
index eef7de48163e298956a622608883016e77535986..5cc5b77848474dfe5c13976367584264bc8d3669 100644
--- a/chrome/browser/devtools/device/devtools_android_bridge.cc
+++ b/chrome/browser/devtools/device/devtools_android_bridge.cc
@@ -33,14 +33,11 @@
#include "chrome/browser/devtools/device/port_forwarding_controller.h"
#include "chrome/browser/devtools/device/tcp_device_provider.h"
#include "chrome/browser/devtools/device/usb/usb_device_provider.h"
-#include "chrome/browser/devtools/device/webrtc/webrtc_device_provider.h"
#include "chrome/browser/devtools/devtools_protocol.h"
#include "chrome/browser/devtools/devtools_target_impl.h"
#include "chrome/browser/devtools/devtools_window.h"
#include "chrome/browser/devtools/remote_debugging_server.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
-#include "chrome/browser/signin/signin_manager_factory.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
@@ -70,11 +67,6 @@ const char kPageReloadCommand[] = "Page.reload";
const char kWebViewSocketPrefix[] = "webview_devtools_remote";
-bool IsWebRTCDeviceProviderEnabled() {
- return base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableDevToolsExperiments);
-}
-
bool BrowserIdFromString(const std::string& browser_id_str,
DevToolsAndroidBridge::BrowserId* browser_id) {
size_t colon_pos = browser_id_str.find(':');
@@ -276,10 +268,6 @@ DevToolsAndroidBridge::Factory::Factory()
: BrowserContextKeyedServiceFactory(
"DevToolsAndroidBridge",
BrowserContextDependencyManager::GetInstance()) {
- if (IsWebRTCDeviceProviderEnabled()) {
- DependsOn(ProfileOAuth2TokenServiceFactory::GetInstance());
- DependsOn(SigninManagerFactory::GetInstance());
- }
}
DevToolsAndroidBridge::Factory::~Factory() {}
@@ -288,16 +276,7 @@ KeyedService* DevToolsAndroidBridge::Factory::BuildServiceInstanceFor(
content::BrowserContext* context) const {
Profile* profile = Profile::FromBrowserContext(context);
- ProfileOAuth2TokenService* token_service = nullptr;
- SigninManagerBase* signin_manager = nullptr;
-
- if (IsWebRTCDeviceProviderEnabled()) {
- token_service = ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
- signin_manager = SigninManagerFactory::GetForProfile(profile);
- }
-
- return new DevToolsAndroidBridge(
- profile, signin_manager, token_service);
+ return new DevToolsAndroidBridge(profile);
}
// AgentHostDelegate ----------------------------------------------------------
@@ -732,12 +711,8 @@ DevToolsAndroidBridge::RemoteDevice::~RemoteDevice() {
// DevToolsAndroidBridge ------------------------------------------------------
DevToolsAndroidBridge::DevToolsAndroidBridge(
- Profile* profile,
- SigninManagerBase* signin_manager,
- ProfileOAuth2TokenService* const token_service)
+ Profile* profile)
: profile_(profile),
- signin_manager_(signin_manager),
- token_service_(token_service),
device_manager_(AndroidDeviceManager::Create()),
task_scheduler_(base::Bind(&DevToolsAndroidBridge::ScheduleTaskDefault)),
port_forwarding_controller_(new PortForwardingController(profile, this)),
@@ -962,11 +937,6 @@ void DevToolsAndroidBridge::CreateDeviceProviders() {
device_providers.push_back(new UsbDeviceProvider(profile_));
}
- if (IsWebRTCDeviceProviderEnabled()) {
- device_providers.push_back(
- new WebRTCDeviceProvider(profile_, signin_manager_, token_service_));
- }
-
device_manager_->SetDeviceProviders(device_providers);
if (NeedsDeviceListPolling()) {
StopDeviceListPolling();
« no previous file with comments | « chrome/browser/devtools/device/devtools_android_bridge.h ('k') | chrome/browser/devtools/device/webrtc/background_worker.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698