chrome/browser/extensions/extension_web_ui_unittest.cc - Issue 1543923002: [Extensions] Fix chrome url override settings

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1543923002: [Extensions] Fix chrome url override settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years 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

« chrome/browser/extensions/extension_web_ui.cc ('K') | « chrome/browser/extensions/extension_web_ui_override_registrar.cc ('k') | chrome/test/data/extensions/api_test/override/newtab/manifest.json » ('j') | chrome/test/data/extensions/api_test/override/newtab/manifest.json » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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/command_line.h"	5 #include "base/command_line.h"

6 #include "base/message_loop/message_loop.h"	6 #include "base/message_loop/message_loop.h"

7 #include "chrome/browser/extensions/extension_service.h"	7 #include "chrome/browser/extensions/extension_service.h"

8 #include "chrome/browser/extensions/extension_web_ui.h"	8 #include "chrome/browser/extensions/extension_web_ui.h"

9 #include "chrome/browser/extensions/test_extension_system.h"	9 #include "chrome/browser/extensions/test_extension_system.h"

10 #include "chrome/test/base/testing_profile.h"	10 #include "chrome/test/base/testing_profile.h"

(...skipping 91 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
102	102

103 // Unregister non-component extension. Only component extension remaining.	103 // Unregister non-component extension. Only component extension remaining.

104 ExtensionWebUI::UnregisterChromeURLOverrides(	104 ExtensionWebUI::UnregisterChromeURLOverrides(

105 profile_.get(), URLOverrides::GetChromeURLOverrides(ext_unpacked.get()));	105 profile_.get(), URLOverrides::GetChromeURLOverrides(ext_unpacked.get()));

106 url = GURL("chrome://bookmarks");	106 url = GURL("chrome://bookmarks");

107 EXPECT_TRUE(ExtensionWebUI::HandleChromeURLOverride(&url, profile_.get()));	107 EXPECT_TRUE(ExtensionWebUI::HandleChromeURLOverride(&url, profile_.get()));

108 EXPECT_EQ(url, expected_component_override_url);	108 EXPECT_EQ(url, expected_component_override_url);

109	109

110 // This time the non-component extension was registered more recently and	110 // This time the non-component extension was registered more recently and

111 // should still take precedence.	111 // should still take precedence.

112 ExtensionWebUI::RegisterChromeURLOverrides(	112 ExtensionWebUI::RegisterOrActivateChromeURLOverrides(

113 profile_.get(), URLOverrides::GetChromeURLOverrides(ext_unpacked.get()));	113 profile_.get(), URLOverrides::GetChromeURLOverrides(ext_unpacked.get()));

114 url = GURL("chrome://bookmarks");	114 url = GURL("chrome://bookmarks");

115 EXPECT_TRUE(ExtensionWebUI::HandleChromeURLOverride(&url, profile_.get()));	115 EXPECT_TRUE(ExtensionWebUI::HandleChromeURLOverride(&url, profile_.get()));

116 EXPECT_EQ(url, expected_unpacked_override_url);	116 EXPECT_EQ(url, expected_unpacked_override_url);

117 }	117 }

118	118

119 } // namespace extensions	119 } // namespace extensions

OLD	NEW