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

Unified Diff: chrome/browser/ui/toolbar/toolbar_model_unittest.cc

Issue 11428149: Alternate NTP: Move bookmark bar to bottom (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address review comments Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/search/search_ui.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/toolbar/toolbar_model_unittest.cc
diff --git a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc
index 56f24e616dbc4044694325b7a9b361e3de986dc9..59288a08b1bbb255e2f60302b32a4cc041cb02fa 100644
--- a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc
@@ -176,8 +176,7 @@ class ToolbarModelTest : public BrowserWithTestWindowTest {
// Test that we don't replace any URLs when the InstantExtended API is disabled.
TEST_F(ToolbarModelTest, ShouldDisplayURLInstantExtendedAPIDisabled) {
- ASSERT_FALSE(CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableInstantExtendedAPI))
+ ASSERT_FALSE(chrome::search::IsInstantExtendedAPIEnabled(profile()))
<< "This test expects Extended Instant to be disabled.";
ResetDefaultTemplateURL();
@@ -194,12 +193,7 @@ TEST_F(ToolbarModelTest, ShouldDisplayURLInstantExtendedAPIDisabled) {
// Test that we replace URLs when the InstantExtended API is enabled.
TEST_F(ToolbarModelTest, ShouldDisplayURLInstantExtendedAPIEnabled) {
- CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kEnableInstantExtendedAPI);
-
- // Avoid tests on branded Chrome where channel is set to CHANNEL_STABLE.
- if (!chrome::search::IsInstantExtendedAPIEnabled(profile()))
- return;
+ chrome::search::EnableInstantExtendedAPIForTesting();
ResetDefaultTemplateURL();
AddTab(browser(), GURL(chrome::kAboutBlankURL));
« no previous file with comments | « chrome/browser/ui/search/search_ui.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698