Alternate NTP: Move bookmark bar to bottom

chrome/browser/ui/toolbar/toolbar_model_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
@@ skipping 158 matching lines @@
     CommitPendingLoad(&contents->GetController());
     EXPECT_EQ(should_display, toolbar_model->ShouldDisplayURL());
     EXPECT_EQ(expected_text, toolbar_model->GetText(can_replace));
     EXPECT_EQ(would_replace,
               toolbar_model->WouldReplaceSearchURLWithSearchTerms());
   }
 };
 
 // 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();
   AddTab(browser(), GURL(chrome::kAboutBlankURL));
   for (size_t i = 0; i < arraysize(test_items); ++i) {
     const TestItem& test_item = test_items[i];
     NavigateAndCheckText(test_item.url,
                          test_item.expected_text,
                          test_item.expected_replace_text_inactive,
                          false,
                          test_item.should_display);
   }
 }
 
 // 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));
   for (size_t i = 0; i < arraysize(test_items); ++i) {
     const TestItem& test_item = test_items[i];
     NavigateAndCheckText(test_item.url,
                          test_item.expected_text,
                          test_item.expected_replace_text_active,
                          test_item.would_replace,
                          test_item.should_display);
   }
 }