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

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

Issue 2279373002: Refix bug 497949 in a more efficient way that also doesn't rebreak bug 442384. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cleanup
Patch Set: Resync 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
« no previous file with comments | « no previous file | chrome/browser/ui/webui/theme_source.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/ui/browser.h" 6 #include "chrome/browser/ui/browser.h"
7 #include "chrome/browser/ui/tabs/tab_strip_model.h" 7 #include "chrome/browser/ui/tabs/tab_strip_model.h"
8 #include "chrome/common/url_constants.h" 8 #include "chrome/common/url_constants.h"
9 #include "chrome/test/base/in_process_browser_test.h" 9 #include "chrome/test/base/in_process_browser_test.h"
10 #include "chrome/test/base/ui_test_utils.h" 10 #include "chrome/test/base/ui_test_utils.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 NavigationObserver observer( 110 NavigationObserver observer(
111 browser()->tab_strip_model()->GetActiveWebContents()); 111 browser()->tab_strip_model()->GetActiveWebContents());
112 ui_test_utils::NavigateToURL( 112 ui_test_utils::NavigateToURL(
113 browser(), GURL("chrome://theme/IDR_SETTINGS_FAVICON@2x")); 113 browser(), GURL("chrome://theme/IDR_SETTINGS_FAVICON@2x"));
114 EXPECT_EQ(NavigationObserver::SUCCESS, observer.navigation_result()); 114 EXPECT_EQ(NavigationObserver::SUCCESS, observer.navigation_result());
115 115
116 // Unreasonably large scale 116 // Unreasonably large scale
117 observer.Reset(); 117 observer.Reset();
118 ui_test_utils::NavigateToURL( 118 ui_test_utils::NavigateToURL(
119 browser(), GURL("chrome://theme/IDR_SETTINGS_FAVICON@99999x")); 119 browser(), GURL("chrome://theme/IDR_SETTINGS_FAVICON@99999x"));
120 EXPECT_EQ(NavigationObserver::SUCCESS, observer.navigation_result()); 120 EXPECT_EQ(NavigationObserver::ERROR_PAGE, observer.navigation_result());
121 } 121 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/webui/theme_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698