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

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

Issue 598663002: Revert of DevTools: Made id unique across different remote browsers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « no previous file | chrome/browser/devtools/device/adb/mock_adb_server.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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" 8 #include "chrome/browser/devtools/devtools_target_impl.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/test/base/in_process_browser_test.h" 10 #include "chrome/test/base/in_process_browser_test.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 ASSERT_EQ("4.0", webview->version()); 94 ASSERT_EQ("4.0", webview->version());
95 95
96 std::vector<DevToolsAndroidBridge::RemotePage*> chrome_pages = 96 std::vector<DevToolsAndroidBridge::RemotePage*> chrome_pages =
97 chrome->CreatePages(); 97 chrome->CreatePages();
98 std::vector<DevToolsAndroidBridge::RemotePage*> chrome_beta_pages = 98 std::vector<DevToolsAndroidBridge::RemotePage*> chrome_beta_pages =
99 chrome_beta->CreatePages(); 99 chrome_beta->CreatePages();
100 std::vector<DevToolsAndroidBridge::RemotePage*> webview_pages = 100 std::vector<DevToolsAndroidBridge::RemotePage*> webview_pages =
101 webview->CreatePages(); 101 webview->CreatePages();
102 102
103 ASSERT_EQ(1U, chrome_pages.size()); 103 ASSERT_EQ(1U, chrome_pages.size());
104 ASSERT_EQ(1U, chrome_beta_pages.size()); 104 ASSERT_EQ(0U, chrome_beta_pages.size());
105 ASSERT_EQ(2U, webview_pages.size()); 105 ASSERT_EQ(2U, webview_pages.size());
106 106
107 // Check that we have non-empty description for webview pages. 107 // Check that we have non-empty description for webview pages.
108 ASSERT_EQ(0U, chrome_pages[0]->GetTarget()->GetDescription().size()); 108 ASSERT_EQ(0U, chrome_pages[0]->GetTarget()->GetDescription().size());
109 ASSERT_EQ(0U, chrome_beta_pages[0]->GetTarget()->GetDescription().size());
110 ASSERT_NE(0U, webview_pages[0]->GetTarget()->GetDescription().size()); 109 ASSERT_NE(0U, webview_pages[0]->GetTarget()->GetDescription().size());
111 ASSERT_NE(0U, webview_pages[1]->GetTarget()->GetDescription().size()); 110 ASSERT_NE(0U, webview_pages[1]->GetTarget()->GetDescription().size());
112 111
113 ASSERT_EQ(GURL("http://www.chromium.org/"), 112 ASSERT_EQ(GURL("http://www.chromium.org/"),
114 chrome_pages[0]->GetTarget()->GetURL()); 113 chrome_pages[0]->GetTarget()->GetURL());
115 ASSERT_EQ("The Chromium Projects", 114 ASSERT_EQ("The Chromium Projects",
116 chrome_pages[0]->GetTarget()->GetTitle()); 115 chrome_pages[0]->GetTarget()->GetTitle());
117 116
118 STLDeleteElements(&chrome_pages); 117 STLDeleteElements(&chrome_pages);
119 STLDeleteElements(&webview_pages); 118 STLDeleteElements(&webview_pages);
120 } 119 }
121 120
122 private: 121 private:
123 scoped_refptr<DevToolsAndroidBridge> android_bridge_; 122 scoped_refptr<DevToolsAndroidBridge> android_bridge_;
124 DevToolsAndroidBridge::RemoteDevices devices_; 123 DevToolsAndroidBridge::RemoteDevices devices_;
125 }; 124 };
126 125
127 IN_PROC_BROWSER_TEST_F(AdbClientSocketTest, TestAdbClientSocket) { 126 IN_PROC_BROWSER_TEST_F(AdbClientSocketTest, TestAdbClientSocket) {
128 StartMockAdbServer(); 127 StartMockAdbServer();
129 StartTest(); 128 StartTest();
130 CheckDevices(); 129 CheckDevices();
131 StopMockAdbServer(); 130 StopMockAdbServer();
132 } 131 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/devtools/device/adb/mock_adb_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698