Renderer initiated navigations from non instant process should not fall into instant.

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 <vector>
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
-#include "chrome/browser/search/instant_service.h"
-#include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "content/public/browser/navigation_entry.h"
@@ skipping 120 matching lines @@
     TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(
         profile(), &TemplateURLServiceFactory::BuildInstanceFor);
     AutocompleteClassifierFactory::GetInstance()->SetTestingFactoryAndUse(
         profile(), &AutocompleteClassifierFactory::BuildInstanceFor);
   }
   virtual void TearDown() OVERRIDE { BrowserWithTestWindowTest::TearDown(); }
 
  protected:
 
   void ResetDefaultTemplateURL() {
+    ResetTemplateURLForInstant(GURL("http://does/not/exist"));
+  }
+
+  void ResetTemplateURLForInstant(const GURL& instant_url) {
     TemplateURLData data;
+    data.short_name = ASCIIToUTF16("Google");
     data.SetURL("http://google.com/search?q={searchTerms}");
-    data.instant_url = "http://does/not/exist";
+    data.instant_url = instant_url.spec();
     data.search_terms_replacement_key = "{google:instantExtendedEnabledKey}";
     TemplateURL* search_template_url = new TemplateURL(profile(), data);
     TemplateURLService* template_url_service =
         TemplateURLServiceFactory::GetForProfile(profile());
     template_url_service->Add(search_template_url);
     template_url_service->SetDefaultSearchProvider(search_template_url);
     ASSERT_NE(0, search_template_url->id());
     template_url_service->Load();
   }
 
@@ skipping 31 matching lines @@
                                search_terms_type, true);
     }
   }
 
  private:
   void NavigateAndCheckTextImpl(const GURL& url,
                                 bool can_replace,
                                 const string16 expected_text,
                                 ToolbarModel::SearchTermsType search_terms_type,
                                 bool should_display) {
+    // The URL being navigated to should be treated as the Instant URL. Else
+    // there will be no search term extraction.
+    ResetTemplateURLForInstant(url);
+
     WebContents* contents = browser()->tab_strip_model()->GetWebContentsAt(0);
     browser()->OpenURL(OpenURLParams(
         url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED,
         false));
 
-    // Query terms replacement requires that the renderer process be a
-    // recognized Instant renderer. Fake it.
-    InstantService* instant_service =
-        InstantServiceFactory::GetForProfile(profile());
-    int process_id = contents->GetRenderProcessHost()->GetID();
-    instant_service->AddInstantProcess(process_id);
-
     ToolbarModel* toolbar_model = browser()->toolbar_model();
 
     // Check while loading.
     contents->GetController().GetVisibleEntry()->GetSSL().security_style =
         content::SECURITY_STYLE_AUTHENTICATED;
     EXPECT_EQ(should_display, toolbar_model->ShouldDisplayURL());
     EXPECT_EQ(expected_text, toolbar_model->GetText(can_replace));
     EXPECT_EQ(search_terms_type, toolbar_model->GetSearchTermsType());
 
     // Check after commit.
@@ skipping 101 matching lines @@
   browser()->toolbar_model()->SetSupportsExtractionOfURLLikeSearchTerms(true);
   ResetDefaultTemplateURL();
   AddTab(browser(), GURL(chrome::kAboutBlankURL));
 
   WebContents* contents = browser()->tab_strip_model()->GetWebContentsAt(0);
   contents->GetController().LoadURL(
       GURL("https://google.com/search?q=tractor+supply&espv=1"),
       content::Referrer(),
       content::PAGE_TRANSITION_LINK,
       std::string());
-  InstantService* instant_service =
-      InstantServiceFactory::GetForProfile(profile());
-  int process_id = contents->GetRenderProcessHost()->GetID();
-  instant_service->AddInstantProcess(process_id);
 
   // While loading search term type should be normal.
   ToolbarModel* toolbar_model = browser()->toolbar_model();
   contents->GetController().GetVisibleEntry()->GetSSL().security_style =
       content::SECURITY_STYLE_UNKNOWN;
   EXPECT_EQ(ToolbarModel::NORMAL_SEARCH_TERMS,
             toolbar_model->GetSearchTermsType());
 
   CommitPendingLoad(&contents->GetController());
 
   // When done loading search term type should not be normal.
   contents->GetController().GetVisibleEntry()->GetSSL().security_style =
       content::SECURITY_STYLE_UNKNOWN;
   EXPECT_EQ(ToolbarModel::URL_LIKE_SEARCH_TERMS,
             toolbar_model->GetSearchTermsType());
 }