DevTools: Unify ADB-related browser tests

chrome/browser/devtools/device/android_device_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_DEVTOOLS_DEVICE_ANDROID_DEVICE_MANAGER_H_
 #define CHROME_BROWSER_DEVTOOLS_DEVICE_ANDROID_DEVICE_MANAGER_H_
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
@@ skipping 17 matching lines @@
 
     typedef AndroidDeviceManager::CommandCallback CommandCallback;
     typedef AndroidDeviceManager::SocketCallback SocketCallback;
 
     Device(const std::string& serial, bool is_connected);
 
     virtual void RunCommand(const std::string& command,
                             const CommandCallback& callback) = 0;
     virtual void OpenSocket(const std::string& socket_name,
                             const SocketCallback& callback) = 0;
-    virtual void HttpQuery(const std::string& la_name,
-                           const std::string& request,
-                           const CommandCallback& callback);
+    void HttpQuery(const std::string& la_name,
+                   const std::string& request,
+                   const CommandCallback& callback);
     void HttpUpgrade(const std::string& la_name,
                      const std::string& request,
                      const SocketCallback& callback);
 
     std::string serial() { return serial_; }
     bool is_connected() { return is_connected_; }
 
     friend class base::RefCounted<Device>;
     virtual ~Device();
 
@@ skipping 33 matching lines @@
 
     DeviceProvider();
     virtual ~DeviceProvider();
   };
 
  public:
   static scoped_refptr<DeviceProvider> GetAdbDeviceProvider();
   static scoped_refptr<DeviceProvider> GetUsbDeviceProvider(Profile* profile);
   // Use only in a test and/or when DEBUG_DEVTOOLS is defined.
   static scoped_refptr<DeviceProvider> GetSelfAsDeviceProvider(int port);
-  // Implemented in browser_tests.
-  static scoped_refptr<DeviceProvider> GetMockDeviceProviderForTest();
 
   static scoped_refptr<AndroidDeviceManager> Create();
 
   typedef std::vector<scoped_refptr<DeviceProvider> > DeviceProviders;
   typedef base::Callback<void (const std::vector<std::string>&)>
       QueryDevicesCallback;
 
   void QueryDevices(const DeviceProviders& providers,
                     const QueryDevicesCallback& callback);
 
@@ skipping 34 matching lines @@
 
   Device* FindDevice(const std::string& serial);
 
   typedef std::map<std::string, scoped_refptr<Device> > DeviceMap;
   DeviceMap devices_;
 
   bool stopped_;
 };
 
 #endif  // CHROME_BROWSER_DEVTOOLS_DEVICE_ANDROID_DEVICE_MANAGER_H_