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

Side by Side Diff: chrome/browser/extensions/extension_url_rewrite_browsertest.cc

Issue 22403003: Update chrome://newtab checks in browser tests to use chrome::IsNTPURL(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/extensions/lazy_background_page_apitest.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/strings/sys_string_conversions.h" 5 #include "base/strings/sys_string_conversions.h"
6 #include "base/strings/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #include "chrome/browser/extensions/component_loader.h" 7 #include "chrome/browser/extensions/component_loader.h"
8 #include "chrome/browser/extensions/extension_browsertest.h" 8 #include "chrome/browser/extensions/extension_browsertest.h"
9 #include "chrome/browser/search/search.h"
9 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/browser_window.h" 11 #include "chrome/browser/ui/browser_window.h"
11 #include "chrome/browser/ui/omnibox/location_bar.h" 12 #include "chrome/browser/ui/omnibox/location_bar.h"
12 #include "chrome/browser/ui/omnibox/omnibox_view.h" 13 #include "chrome/browser/ui/omnibox/omnibox_view.h"
13 #include "chrome/browser/ui/tabs/tab_strip_model.h" 14 #include "chrome/browser/ui/tabs/tab_strip_model.h"
14 #include "chrome/common/url_constants.h" 15 #include "chrome/common/url_constants.h"
15 #include "chrome/test/base/in_process_browser_test.h" 16 #include "chrome/test/base/in_process_browser_test.h"
16 #include "chrome/test/base/testing_profile.h" 17 #include "chrome/test/base/testing_profile.h"
17 #include "chrome/test/base/ui_test_utils.h" 18 #include "chrome/test/base/ui_test_utils.h"
18 #include "content/public/browser/navigation_controller.h" 19 #include "content/public/browser/navigation_controller.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 EXPECT_EQ("", GetLocationBarText()); 73 EXPECT_EQ("", GetLocationBarText());
73 EXPECT_EQ(url, GetNavigationEntry()->GetVirtualURL()); 74 EXPECT_EQ(url, GetNavigationEntry()->GetVirtualURL());
74 } 75 }
75 }; 76 };
76 77
77 IN_PROC_BROWSER_TEST_F(ExtensionURLRewriteBrowserTest, NewTabPageURL) { 78 IN_PROC_BROWSER_TEST_F(ExtensionURLRewriteBrowserTest, NewTabPageURL) {
78 // Navigate to chrome://newtab and check that the location bar text is blank. 79 // Navigate to chrome://newtab and check that the location bar text is blank.
79 GURL url(chrome::kChromeUINewTabURL); 80 GURL url(chrome::kChromeUINewTabURL);
80 TestURLNotShown(url); 81 TestURLNotShown(url);
81 // Check that the actual URL corresponds to chrome://newtab. 82 // Check that the actual URL corresponds to chrome://newtab.
82 EXPECT_EQ(url, GetNavigationEntry()->GetURL()); 83 EXPECT_TRUE(chrome::IsNTPURL(GetNavigationEntry()->GetURL(), profile()));
samarth 2013/08/30 15:33:56 I don't think we want to change this one since it'
kmadhusu 2013/08/30 17:16:09 Done.
83 } 84 }
84 85
85 IN_PROC_BROWSER_TEST_F(ExtensionURLRewriteBrowserTest, NewTabPageURLOverride) { 86 IN_PROC_BROWSER_TEST_F(ExtensionURLRewriteBrowserTest, NewTabPageURLOverride) {
86 // Load an extension to override the NTP and check that the location bar text 87 // Load an extension to override the NTP and check that the location bar text
87 // is blank after navigating to chrome://newtab. 88 // is blank after navigating to chrome://newtab.
88 ASSERT_TRUE(LoadExtension(GetTestExtensionPath("newtab"))); 89 ASSERT_TRUE(LoadExtension(GetTestExtensionPath("newtab")));
89 TestURLNotShown(GURL(chrome::kChromeUINewTabURL)); 90 TestURLNotShown(GURL(chrome::kChromeUINewTabURL));
90 // Check that the internal URL uses the chrome-extension:// scheme. 91 // Check that the internal URL uses the chrome-extension:// scheme.
91 EXPECT_TRUE(GetNavigationEntry()->GetURL().SchemeIs( 92 EXPECT_TRUE(GetNavigationEntry()->GetURL().SchemeIs(
92 extensions::kExtensionScheme)); 93 extensions::kExtensionScheme));
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 TestExtensionURLOverride(url_with_ref); 127 TestExtensionURLOverride(url_with_ref);
127 } 128 }
128 129
129 IN_PROC_BROWSER_TEST_F(ExtensionURLRewriteBrowserTest, BookmarksURLOverride) { 130 IN_PROC_BROWSER_TEST_F(ExtensionURLRewriteBrowserTest, BookmarksURLOverride) {
130 // Load an extension that overrides chrome://bookmarks. 131 // Load an extension that overrides chrome://bookmarks.
131 ASSERT_TRUE(LoadExtension(GetTestExtensionPath("bookmarks"))); 132 ASSERT_TRUE(LoadExtension(GetTestExtensionPath("bookmarks")));
132 // Navigate to chrome://bookmarks and check that the location bar URL is what 133 // Navigate to chrome://bookmarks and check that the location bar URL is what
133 // was entered and the internal URL uses the chrome-extension:// scheme. 134 // was entered and the internal URL uses the chrome-extension:// scheme.
134 TestExtensionURLOverride(GURL(chrome::kChromeUIBookmarksURL)); 135 TestExtensionURLOverride(GURL(chrome::kChromeUIBookmarksURL));
135 } 136 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/lazy_background_page_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698