Alternate NTP: Move bookmark bar to bottom

chrome/browser/ui/search/search_delegate_unittest.cc

Index: chrome/browser/ui/search/search_delegate_unittest.cc
diff --git a/chrome/browser/ui/search/search_delegate_unittest.cc b/chrome/browser/ui/search/search_delegate_unittest.cc
index 07d6a1c3b89333457a486f21fdc610810f7f29c7..0317a4cc0b9c212091a11d399c5f75b91dd55574 100644
--- a/chrome/browser/ui/search/search_delegate_unittest.cc
+++ b/chrome/browser/ui/search/search_delegate_unittest.cc
@@ -2,13 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/command_line.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/search/search.h"
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 
 namespace chrome {
@@ -19,12 +17,7 @@ typedef BrowserWithTestWindowTest SearchDelegateTest;
 // Test the propagation of search "mode" changes from the tab's search model to
 // the browser's search model.
 TEST_F(SearchDelegateTest, SearchModel) {
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  command_line->AppendSwitch(switches::kEnableInstantExtendedAPI);
-
-  // Avoid these tests on branded Chrome where channel is set to CHANNEL_STABLE.
-  if (!chrome::search::IsInstantExtendedAPIEnabled(profile()))
-    return;
+  chrome::search::SetForceInstantExtendedAPIEnabledForTesting(true);
 
   // Initial state.
   EXPECT_TRUE(browser()->search_model()->mode().is_default());
@@ -50,6 +43,8 @@ TEST_F(SearchDelegateTest, SearchModel) {
   chrome::search::SearchTabHelper::FromWebContents(web_contents)->model()->
       SetMode(Mode(Mode::MODE_NTP, Mode::ORIGIN_NTP, false));
   EXPECT_TRUE(browser()->search_model()->mode().is_search());
+
+  chrome::search::SetForceInstantExtendedAPIEnabledForTesting(false);
 }
 
 }  // namespace search