[DevTools] Switch remote locations to Target domain.

chrome/browser/devtools/device/devtools_device_discovery.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/devtools/device/devtools_device_discovery.h"
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 252 matching lines @@
       base::StartsWith(browser_id_, kWebViewSocketPrefix,
                        base::CompareCase::SENSITIVE)
           ? base::UserMetricsAction("DevTools_InspectAndroidWebView")
           : base::UserMetricsAction("DevTools_InspectAndroidPage"));
   web_socket_.reset(
       device_->CreateWebSocket(browser_id_, target_path_, this));
 }
 
 void AgentHostDelegate::Detach() {
   web_socket_.reset();
+  proxy_->ConnectionClosed();
   proxy_ = nullptr;
 }
 
 std::string AgentHostDelegate::GetType() {
   return remote_type_;
 }
 
 std::string AgentHostDelegate::GetTitle() {
   return title_;
 }
@@ skipping 327 matching lines @@
 }
 
 void DevToolsDeviceDiscovery::ReceivedDeviceList(
     const CompleteDevices& complete_devices) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   task_scheduler_.Run(base::Bind(&DevToolsDeviceDiscovery::RequestDeviceList,
                                  weak_factory_.GetWeakPtr()));
   // |callback_| should be run last as it may destroy |this|.
   callback_.Run(complete_devices);
 }
-
-namespace {
-
-class OnceWrapper {
- public:
-  OnceWrapper(AndroidDeviceManager* device_manager,
-              const DevToolsDeviceDiscovery::DeviceListCallback& callback)
-      : callback_(callback) {
-    discovery_.reset(new DevToolsDeviceDiscovery(device_manager,
-         base::Bind(&OnceWrapper::Callback, base::Unretained(this))));
-    discovery_->SetScheduler(base::Bind(&OnceWrapper::NoOp));
-  }
-
- private:
-  static void NoOp(const base::Closure&) {}
-
-  void Callback(const DevToolsDeviceDiscovery::CompleteDevices& devices) {
-    callback_.Run(devices);
-    delete this;
-  }
-
-  std::unique_ptr<DevToolsDeviceDiscovery> discovery_;
-  const DevToolsDeviceDiscovery::DeviceListCallback callback_;
-};
-
-} // namespace
-
-// static
-void DevToolsDeviceDiscovery::DiscoverOnce(
-    AndroidDeviceManager* device_manager,
-    const DeviceListCallback& callback) {
-  new OnceWrapper(device_manager, callback);
-}