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

Side by Side Diff: chrome/browser/devtools/devtools_sanity_browsertest.cc

Issue 2248873002: Convert WindowOpenDisposition to an enum class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix weird formatting in recent_tabs_sub_menu_model.cc 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 (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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/cancelable_callback.h" 10 #include "base/cancelable_callback.h"
(...skipping 1172 matching lines...) Expand 10 before | Expand all | Expand 10 after
1183 OpenDevToolsWindow("about:blank", false); 1183 OpenDevToolsWindow("about:blank", false);
1184 SwitchToPanel(window_, panel_name); 1184 SwitchToPanel(window_, panel_name);
1185 ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL)); 1185 ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL));
1186 1186
1187 content::RenderProcessHostWatcher crash_observer( 1187 content::RenderProcessHostWatcher crash_observer(
1188 GetInspectedTab(), 1188 GetInspectedTab(),
1189 content::RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); 1189 content::RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT);
1190 ui_test_utils::NavigateToURL(browser(), GURL(content::kChromeUICrashURL)); 1190 ui_test_utils::NavigateToURL(browser(), GURL(content::kChromeUICrashURL));
1191 crash_observer.Wait(); 1191 crash_observer.Wait();
1192 content::TestNavigationObserver navigation_observer(GetInspectedTab(), 1); 1192 content::TestNavigationObserver navigation_observer(GetInspectedTab(), 1);
1193 chrome::Reload(browser(), CURRENT_TAB); 1193 chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
1194 navigation_observer.Wait(); 1194 navigation_observer.Wait();
1195 } 1195 }
1196 }; 1196 };
1197 1197
1198 IN_PROC_BROWSER_TEST_F(DevToolsReattachAfterCrashTest, 1198 IN_PROC_BROWSER_TEST_F(DevToolsReattachAfterCrashTest,
1199 TestReattachAfterCrashOnTimeline) { 1199 TestReattachAfterCrashOnTimeline) {
1200 RunTestWithPanel("timeline"); 1200 RunTestWithPanel("timeline");
1201 } 1201 }
1202 1202
1203 IN_PROC_BROWSER_TEST_F(DevToolsReattachAfterCrashTest, 1203 IN_PROC_BROWSER_TEST_F(DevToolsReattachAfterCrashTest,
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
1434 test_factory.AddFactoryOverride(GURL("chrome://dummyurl").host(), 1434 test_factory.AddFactoryOverride(GURL("chrome://dummyurl").host(),
1435 &mock_provider); 1435 &mock_provider);
1436 content::WebUIControllerFactory::RegisterFactory(&test_factory); 1436 content::WebUIControllerFactory::RegisterFactory(&test_factory);
1437 1437
1438 ui_test_utils::NavigateToURL(browser(), GURL("chrome://dummyurl")); 1438 ui_test_utils::NavigateToURL(browser(), GURL("chrome://dummyurl"));
1439 DevToolsWindow* window = 1439 DevToolsWindow* window =
1440 DevToolsWindowTesting::OpenDevToolsWindowSync(GetInspectedTab(), true); 1440 DevToolsWindowTesting::OpenDevToolsWindowSync(GetInspectedTab(), true);
1441 chrome::DuplicateTab(browser()); 1441 chrome::DuplicateTab(browser());
1442 chrome::SelectPreviousTab(browser()); 1442 chrome::SelectPreviousTab(browser());
1443 ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); 1443 ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
1444 chrome::GoBack(browser(), CURRENT_TAB); 1444 chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
1445 RunTestFunction(window, "testWindowInitializedOnNavigateBack"); 1445 RunTestFunction(window, "testWindowInitializedOnNavigateBack");
1446 1446
1447 DevToolsWindowTesting::CloseDevToolsWindowSync(window); 1447 DevToolsWindowTesting::CloseDevToolsWindowSync(window);
1448 content::WebUIControllerFactory::UnregisterFactoryForTesting(&test_factory); 1448 content::WebUIControllerFactory::UnregisterFactoryForTesting(&test_factory);
1449 } 1449 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698