Revert of DevTools: merge devtools target with devtools host, part 1

chrome/browser/devtools/device/adb/adb_client_socket_browsertest.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/adb/adb_device_provider.h"
 #include "chrome/browser/devtools/device/adb/mock_adb_server.h"
 #include "chrome/browser/devtools/device/devtools_android_bridge.h"
 #include "chrome/browser/devtools/devtools_target_impl.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ skipping 100 matching lines @@
     std::unique_ptr<DevToolsTargetImpl> chrome_target(
         android_bridge_->CreatePageTarget(chrome_pages[0]));
     std::unique_ptr<DevToolsTargetImpl> chrome_beta_target(
         android_bridge_->CreatePageTarget(chrome_beta_pages[0]));
     std::unique_ptr<DevToolsTargetImpl> webview_target_0(
         android_bridge_->CreatePageTarget(webview_pages[0]));
     std::unique_ptr<DevToolsTargetImpl> webview_target_1(
         android_bridge_->CreatePageTarget(webview_pages[1]));
 
     // Check that we have non-empty description for webview pages.
-    ASSERT_EQ(0U, chrome_target->GetAgentHost()->GetDescription().size());
-    ASSERT_EQ(0U, chrome_beta_target->GetAgentHost()->GetDescription().size());
-    ASSERT_NE(0U, webview_target_0->GetAgentHost()->GetDescription().size());
-    ASSERT_NE(0U, webview_target_1->GetAgentHost()->GetDescription().size());
+    ASSERT_EQ(0U, chrome_target->GetDescription().size());
+    ASSERT_EQ(0U, chrome_beta_target->GetDescription().size());
+    ASSERT_NE(0U, webview_target_0->GetDescription().size());
+    ASSERT_NE(0U, webview_target_1->GetDescription().size());
 
     ASSERT_EQ(GURL("http://www.chromium.org/"),
-                   chrome_target->GetAgentHost()->GetURL());
+                   chrome_target->GetURL());
     ASSERT_EQ("The Chromium Projects",
-              chrome_target->GetAgentHost()->GetTitle());
+              chrome_target->GetTitle());
   }
 
  private:
   DevToolsAndroidBridge* android_bridge_;
   DevToolsAndroidBridge::RemoteDevices devices_;
 };
 
 // Flaky due to failure to bind a hardcoded port. crbug.com/566057
 IN_PROC_BROWSER_TEST_F(AdbClientSocketTest, DISABLED_TestFlushWithoutSize) {
   StartMockAdbServer(FlushWithoutSize);
@@ skipping 10 matching lines @@
   StopMockAdbServer();
 }
 
 // Flaky due to failure to bind a hardcoded port. crbug.com/566057
 IN_PROC_BROWSER_TEST_F(AdbClientSocketTest, DISABLED_TestFlushWithData) {
   StartMockAdbServer(FlushWithData);
   StartTest();
   CheckDevices();
   StopMockAdbServer();
 }