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

Side by Side Diff: chrome/browser/ui/webui/inspect_ui_browsertest.cc

Issue 2664753002: Remove base::StringValue (Closed)
Patch Set: Rebase Created 3 years, 9 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 | « chrome/browser/ui/webui/inspect_ui.cc ('k') | chrome/browser/ui/webui/instant_ui.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/macros.h" 5 #include "base/macros.h"
6 #include "chrome/browser/devtools/device/adb/adb_device_provider.h" 6 #include "chrome/browser/devtools/device/adb/adb_device_provider.h"
7 #include "chrome/browser/devtools/device/adb/mock_adb_server.h" 7 #include "chrome/browser/devtools/device/adb/mock_adb_server.h"
8 #include "chrome/browser/devtools/device/devtools_android_bridge.h" 8 #include "chrome/browser/devtools/device/devtools_android_bridge.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/tabs/tab_strip_model.h" 10 #include "chrome/browser/ui/tabs/tab_strip_model.h"
(...skipping 21 matching lines...) Expand all
32 AddLibrary(base::FilePath(FILE_PATH_LITERAL("inspect_ui_test.js"))); 32 AddLibrary(base::FilePath(FILE_PATH_LITERAL("inspect_ui_test.js")));
33 } 33 }
34 34
35 private: 35 private:
36 DISALLOW_COPY_AND_ASSIGN(InspectUITest); 36 DISALLOW_COPY_AND_ASSIGN(InspectUITest);
37 }; 37 };
38 38
39 IN_PROC_BROWSER_TEST_F(InspectUITest, InspectUIPage) { 39 IN_PROC_BROWSER_TEST_F(InspectUITest, InspectUIPage) {
40 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIInspectURL)); 40 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIInspectURL));
41 ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest( 41 ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest(
42 "testTargetListed", 42 "testTargetListed", new base::Value("#pages"),
43 new base::StringValue("#pages"), 43 new base::Value("populateWebContentsTargets"),
44 new base::StringValue("populateWebContentsTargets"), 44 new base::Value(chrome::kChromeUIInspectURL)));
45 new base::StringValue(chrome::kChromeUIInspectURL)));
46 } 45 }
47 46
48 IN_PROC_BROWSER_TEST_F(InspectUITest, SharedWorker) { 47 IN_PROC_BROWSER_TEST_F(InspectUITest, SharedWorker) {
49 ASSERT_TRUE(embedded_test_server()->Start()); 48 ASSERT_TRUE(embedded_test_server()->Start());
50 GURL url = embedded_test_server()->GetURL(kSharedWorkerTestPage); 49 GURL url = embedded_test_server()->GetURL(kSharedWorkerTestPage);
51 ui_test_utils::NavigateToURL(browser(), url); 50 ui_test_utils::NavigateToURL(browser(), url);
52 51
53 ui_test_utils::NavigateToURLWithDisposition( 52 ui_test_utils::NavigateToURLWithDisposition(
54 browser(), GURL(chrome::kChromeUIInspectURL), 53 browser(), GURL(chrome::kChromeUIInspectURL),
55 WindowOpenDisposition::NEW_FOREGROUND_TAB, 54 WindowOpenDisposition::NEW_FOREGROUND_TAB,
56 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); 55 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
57 56
58 ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest( 57 ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest(
59 "testTargetListed", 58 "testTargetListed", new base::Value("#workers"),
60 new base::StringValue("#workers"), 59 new base::Value("populateWorkerTargets"),
61 new base::StringValue("populateWorkerTargets"), 60 new base::Value(kSharedWorkerJs)));
62 new base::StringValue(kSharedWorkerJs)));
63 61
64 ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest( 62 ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest(
65 "testTargetListed", 63 "testTargetListed", new base::Value("#pages"),
66 new base::StringValue("#pages"), 64 new base::Value("populateWebContentsTargets"),
67 new base::StringValue("populateWebContentsTargets"), 65 new base::Value(kSharedWorkerTestPage)));
68 new base::StringValue(kSharedWorkerTestPage)));
69 } 66 }
70 67
71 // Flaky due to failure to bind a hardcoded port. crbug.com/566057 68 // Flaky due to failure to bind a hardcoded port. crbug.com/566057
72 IN_PROC_BROWSER_TEST_F(InspectUITest, DISABLED_AndroidTargets) { 69 IN_PROC_BROWSER_TEST_F(InspectUITest, DISABLED_AndroidTargets) {
73 DevToolsAndroidBridge* android_bridge = 70 DevToolsAndroidBridge* android_bridge =
74 DevToolsAndroidBridge::Factory::GetForProfile(browser()->profile()); 71 DevToolsAndroidBridge::Factory::GetForProfile(browser()->profile());
75 AndroidDeviceManager::DeviceProviders providers; 72 AndroidDeviceManager::DeviceProviders providers;
76 providers.push_back(new AdbDeviceProvider()); 73 providers.push_back(new AdbDeviceProvider());
77 android_bridge->set_device_providers_for_test(providers); 74 android_bridge->set_device_providers_for_test(providers);
78 75
79 StartMockAdbServer(FlushWithSize); 76 StartMockAdbServer(FlushWithSize);
80 77
81 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIInspectURL)); 78 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIInspectURL));
82 79
83 ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest("testAdbTargetsListed")); 80 ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest("testAdbTargetsListed"));
84 81
85 StopMockAdbServer(); 82 StopMockAdbServer();
86 } 83 }
87 84
88 IN_PROC_BROWSER_TEST_F(InspectUITest, ReloadCrash) { 85 IN_PROC_BROWSER_TEST_F(InspectUITest, ReloadCrash) {
89 ASSERT_TRUE(embedded_test_server()->Start()); 86 ASSERT_TRUE(embedded_test_server()->Start());
90 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIInspectURL)); 87 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIInspectURL));
91 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIInspectURL)); 88 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIInspectURL));
92 } 89 }
93 90
94 } // namespace 91 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/inspect_ui.cc ('k') | chrome/browser/ui/webui/instant_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698