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

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

Issue 624153002: replace OVERRIDE and FINAL with override and final in chrome/browser/extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 "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/search/search.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
11 #include "chrome/browser/ui/browser_window.h" 11 #include "chrome/browser/ui/browser_window.h"
12 #include "chrome/browser/ui/location_bar/location_bar.h" 12 #include "chrome/browser/ui/location_bar/location_bar.h"
13 #include "chrome/browser/ui/omnibox/omnibox_view.h" 13 #include "chrome/browser/ui/omnibox/omnibox_view.h"
14 #include "chrome/browser/ui/tabs/tab_strip_model.h" 14 #include "chrome/browser/ui/tabs/tab_strip_model.h"
15 #include "chrome/common/url_constants.h" 15 #include "chrome/common/url_constants.h"
16 #include "chrome/test/base/in_process_browser_test.h" 16 #include "chrome/test/base/in_process_browser_test.h"
17 #include "chrome/test/base/testing_profile.h" 17 #include "chrome/test/base/testing_profile.h"
18 #include "chrome/test/base/ui_test_utils.h" 18 #include "chrome/test/base/ui_test_utils.h"
19 #include "content/public/browser/navigation_controller.h" 19 #include "content/public/browser/navigation_controller.h"
20 #include "content/public/browser/navigation_entry.h" 20 #include "content/public/browser/navigation_entry.h"
21 #include "content/public/browser/web_contents.h" 21 #include "content/public/browser/web_contents.h"
22 #include "extensions/common/constants.h" 22 #include "extensions/common/constants.h"
23 #include "url/gurl.h" 23 #include "url/gurl.h"
24 24
25 using content::NavigationEntry; 25 using content::NavigationEntry;
26 26
27 class ExtensionURLRewriteBrowserTest : public ExtensionBrowserTest { 27 class ExtensionURLRewriteBrowserTest : public ExtensionBrowserTest {
28 public: 28 public:
29 virtual void SetUp() OVERRIDE { 29 virtual void SetUp() override {
30 extensions::ComponentLoader::EnableBackgroundExtensionsForTesting(); 30 extensions::ComponentLoader::EnableBackgroundExtensionsForTesting();
31 ExtensionBrowserTest::SetUp(); 31 ExtensionBrowserTest::SetUp();
32 } 32 }
33 33
34 protected: 34 protected:
35 std::string GetLocationBarText() const { 35 std::string GetLocationBarText() const {
36 return base::UTF16ToUTF8( 36 return base::UTF16ToUTF8(
37 browser()->window()->GetLocationBar()->GetOmniboxView()->GetText()); 37 browser()->window()->GetLocationBar()->GetOmniboxView()->GetText());
38 } 38 }
39 39
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 TestExtensionURLOverride(url_with_ref); 113 TestExtensionURLOverride(url_with_ref);
114 } 114 }
115 115
116 IN_PROC_BROWSER_TEST_F(ExtensionURLRewriteBrowserTest, BookmarksURLOverride) { 116 IN_PROC_BROWSER_TEST_F(ExtensionURLRewriteBrowserTest, BookmarksURLOverride) {
117 // Load an extension that overrides chrome://bookmarks. 117 // Load an extension that overrides chrome://bookmarks.
118 ASSERT_TRUE(LoadExtension(GetTestExtensionPath("bookmarks"))); 118 ASSERT_TRUE(LoadExtension(GetTestExtensionPath("bookmarks")));
119 // Navigate to chrome://bookmarks and check that the location bar URL is what 119 // Navigate to chrome://bookmarks and check that the location bar URL is what
120 // was entered and the internal URL uses the chrome-extension:// scheme. 120 // was entered and the internal URL uses the chrome-extension:// scheme.
121 TestExtensionURLOverride(GURL(chrome::kChromeUIBookmarksURL)); 121 TestExtensionURLOverride(GURL(chrome::kChromeUIBookmarksURL));
122 } 122 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_ui_unittest.cc ('k') | chrome/browser/extensions/extension_view_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698