Consolidate search terms extraction and Instant process determination.

chrome/browser/instant/instant_test_utils.cc

 // Copyright 2013 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/instant/instant_test_utils.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/result_codes.h"
 #include "content/public/test/browser_test_utils.h"
 
 namespace {
 
@@ skipping 22 matching lines @@
 }
 
 void InstantTestModelObserver::PreviewStateChanged(const InstantModel& model) {
   if (model.mode().mode == desired_mode_type_)
     run_loop_.Quit();
 }
 
 // InstantTestBase -----------------------------------------------------------
 
 void InstantTestBase::SetupInstant() {
-  CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-      switches::kInstantURL, instant_url_.spec());
-  SetupInstantUsingTemplateURL();
-
-  // TODO(shishir): Fix this ugly hack.
-  instant()->SetInstantEnabled(false, true);
-  instant()->SetInstantEnabled(true, false);
-}
-
-void InstantTestBase::SetupInstantUsingTemplateURL() {
   TemplateURLService* service =
       TemplateURLServiceFactory::GetForProfile(browser()->profile());
   ui_test_utils::WaitForTemplateURLServiceToLoad(service);
 
   TemplateURLData data;
   // Necessary to use exact URL for both the main URL and the alternate URL for
   // search term extraction to work in InstantExtended.
   data.SetURL(instant_url_.spec() + "q={searchTerms}");
   data.instant_url = instant_url_.spec();
   data.alternate_urls.push_back(instant_url_.spec() + "#q={searchTerms}");
   data.search_terms_replacement_key = "strk";
 
   TemplateURL* template_url = new TemplateURL(browser()->profile(), data);
   service->Add(template_url);  // Takes ownership of |template_url|.
   service->SetDefaultSearchProvider(template_url);
+
   browser()->profile()->GetPrefs()->SetBoolean(prefs::kInstantEnabled, true);
+
+  // TODO(shishir): Fix this ugly hack.
+  instant()->SetInstantEnabled(false, true);
+  instant()->SetInstantEnabled(true, false);
 }
 
 void InstantTestBase::KillInstantRenderView() {
   base::KillProcess(
       instant()->GetPreviewContents()->GetRenderProcessHost()->GetHandle(),
       content::RESULT_CODE_KILLED,
       false);
 }
 
 void InstantTestBase::FocusOmnibox() {
@@ skipping 45 matching lines @@
 }
 
 bool InstantTestBase::CheckVisibilityIs(content::WebContents* contents,
                                         bool expected) {
   bool actual = !expected;  // Purposely start with a mis-match.
   // We can only use ASSERT_*() in a method that returns void, hence this
   // convoluted check.
   return GetBoolFromJS(contents, "!document.webkitHidden", &actual) &&
       actual == expected;
 }