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

Side by Side Diff: chrome/browser/devtools/device/adb/adb_client_socket_browsertest.cc

Issue 2273063002: DevTools: remove DevToolsTargetDescriptor and its implementations, we are now based on devtools age… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebaselined Created 4 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/devtools/device/adb/adb_device_provider.h" 5 #include "chrome/browser/devtools/device/adb/adb_device_provider.h"
6 #include "chrome/browser/devtools/device/adb/mock_adb_server.h" 6 #include "chrome/browser/devtools/device/adb/mock_adb_server.h"
7 #include "chrome/browser/devtools/device/devtools_android_bridge.h" 7 #include "chrome/browser/devtools/device/devtools_android_bridge.h"
8 #include "chrome/browser/devtools/devtools_target_impl.h"
9 #include "chrome/browser/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
10 #include "chrome/test/base/in_process_browser_test.h" 9 #include "chrome/test/base/in_process_browser_test.h"
11 #include "content/public/browser/browser_thread.h" 10 #include "content/public/browser/browser_thread.h"
12 #include "content/public/test/test_utils.h" 11 #include "content/public/test/test_utils.h"
13 12
14 using content::BrowserThread; 13 using content::BrowserThread;
15 14
16 static scoped_refptr<DevToolsAndroidBridge::RemoteBrowser> 15 static scoped_refptr<DevToolsAndroidBridge::RemoteBrowser>
17 FindBrowserByDisplayName(DevToolsAndroidBridge::RemoteBrowsers browsers, 16 FindBrowserByDisplayName(DevToolsAndroidBridge::RemoteBrowsers browsers,
18 const std::string& name) { 17 const std::string& name) {
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 chrome->pages(); 100 chrome->pages();
102 DevToolsAndroidBridge::RemotePages chrome_beta_pages = 101 DevToolsAndroidBridge::RemotePages chrome_beta_pages =
103 chrome_beta->pages(); 102 chrome_beta->pages();
104 DevToolsAndroidBridge::RemotePages webview_pages = 103 DevToolsAndroidBridge::RemotePages webview_pages =
105 webview->pages(); 104 webview->pages();
106 105
107 ASSERT_EQ(1U, chrome_pages.size()); 106 ASSERT_EQ(1U, chrome_pages.size());
108 ASSERT_EQ(1U, chrome_beta_pages.size()); 107 ASSERT_EQ(1U, chrome_beta_pages.size());
109 ASSERT_EQ(2U, webview_pages.size()); 108 ASSERT_EQ(2U, webview_pages.size());
110 109
111 std::unique_ptr<DevToolsTargetImpl> chrome_target( 110 scoped_refptr<content::DevToolsAgentHost> chrome_target(
112 android_bridge_->CreatePageTarget(chrome_pages[0])); 111 android_bridge_->CreatePageTarget(chrome_pages[0]));
113 std::unique_ptr<DevToolsTargetImpl> chrome_beta_target( 112 scoped_refptr<content::DevToolsAgentHost> chrome_beta_target(
114 android_bridge_->CreatePageTarget(chrome_beta_pages[0])); 113 android_bridge_->CreatePageTarget(chrome_beta_pages[0]));
115 std::unique_ptr<DevToolsTargetImpl> webview_target_0( 114 scoped_refptr<content::DevToolsAgentHost> webview_target_0(
116 android_bridge_->CreatePageTarget(webview_pages[0])); 115 android_bridge_->CreatePageTarget(webview_pages[0]));
117 std::unique_ptr<DevToolsTargetImpl> webview_target_1( 116 scoped_refptr<content::DevToolsAgentHost> webview_target_1(
118 android_bridge_->CreatePageTarget(webview_pages[1])); 117 android_bridge_->CreatePageTarget(webview_pages[1]));
119 118
120 // Check that we have non-empty description for webview pages. 119 // Check that we have non-empty description for webview pages.
121 ASSERT_EQ(0U, chrome_target->GetAgentHost()->GetDescription().size()); 120 ASSERT_EQ(0U, chrome_target->GetDescription().size());
122 ASSERT_EQ(0U, chrome_beta_target->GetAgentHost()->GetDescription().size()); 121 ASSERT_EQ(0U, chrome_beta_target->GetDescription().size());
123 ASSERT_NE(0U, webview_target_0->GetAgentHost()->GetDescription().size()); 122 ASSERT_NE(0U, webview_target_0->GetDescription().size());
124 ASSERT_NE(0U, webview_target_1->GetAgentHost()->GetDescription().size()); 123 ASSERT_NE(0U, webview_target_1->GetDescription().size());
125 124
126 ASSERT_EQ(GURL("http://www.chromium.org/"), 125 ASSERT_EQ(GURL("http://www.chromium.org/"),
127 chrome_target->GetAgentHost()->GetURL()); 126 chrome_target->GetURL());
128 ASSERT_EQ("The Chromium Projects", 127 ASSERT_EQ("The Chromium Projects",
129 chrome_target->GetAgentHost()->GetTitle()); 128 chrome_target->GetTitle());
130 } 129 }
131 130
132 private: 131 private:
133 DevToolsAndroidBridge* android_bridge_; 132 DevToolsAndroidBridge* android_bridge_;
134 DevToolsAndroidBridge::RemoteDevices devices_; 133 DevToolsAndroidBridge::RemoteDevices devices_;
135 }; 134 };
136 135
137 // Flaky due to failure to bind a hardcoded port. crbug.com/566057 136 // Flaky due to failure to bind a hardcoded port. crbug.com/566057
138 IN_PROC_BROWSER_TEST_F(AdbClientSocketTest, DISABLED_TestFlushWithoutSize) { 137 IN_PROC_BROWSER_TEST_F(AdbClientSocketTest, DISABLED_TestFlushWithoutSize) {
139 StartMockAdbServer(FlushWithoutSize); 138 StartMockAdbServer(FlushWithoutSize);
(...skipping 10 matching lines...) Expand all
150 StopMockAdbServer(); 149 StopMockAdbServer();
151 } 150 }
152 151
153 // Flaky due to failure to bind a hardcoded port. crbug.com/566057 152 // Flaky due to failure to bind a hardcoded port. crbug.com/566057
154 IN_PROC_BROWSER_TEST_F(AdbClientSocketTest, DISABLED_TestFlushWithData) { 153 IN_PROC_BROWSER_TEST_F(AdbClientSocketTest, DISABLED_TestFlushWithData) {
155 StartMockAdbServer(FlushWithData); 154 StartMockAdbServer(FlushWithData);
156 StartTest(); 155 StartTest();
157 CheckDevices(); 156 CheckDevices();
158 StopMockAdbServer(); 157 StopMockAdbServer();
159 } 158 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698