Reload Instant NTP and Instant-process tabs on search url change

chrome/browser/ui/search/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/ui/search/instant_test_utils.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 40 matching lines @@
   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);
 
   InstantService* instant_service =
       InstantServiceFactory::GetForProfile(browser_->profile());
   ASSERT_NE(static_cast<InstantService*>(NULL), instant_service);
-  instant_service->ntp_prerenderer()->ReloadStaleNTP();
+  instant_service->ntp_prerenderer()->ReloadInstantNTP();
 }
 
 void InstantTestBase::SetInstantURL(const std::string& url) {
   TemplateURLService* service =
       TemplateURLServiceFactory::GetForProfile(browser_->profile());
   ui_test_utils::WaitForTemplateURLServiceToLoad(service);
 
   TemplateURLData data;
   data.SetURL(url);
   data.instant_url = url;
@@ skipping 11 matching lines @@
   // If the omnibox already has focus, just notify Instant.
   if (omnibox()->model()->has_focus()) {
     instant()->OmniboxFocusChanged(OMNIBOX_FOCUS_VISIBLE,
                                    OMNIBOX_FOCUS_CHANGE_EXPLICIT, NULL);
   } else {
     browser_->window()->GetLocationBar()->FocusLocation(false);
   }
 }
 
 void InstantTestBase::FocusOmniboxAndWaitForInstantNTPSupport() {
+  FocusOmnibox();
+  WaitForInstantNTPSupport();
+}
+
+void InstantTestBase::WaitForInstantNTPSupport() {
   content::WindowedNotificationObserver ntp_observer(
       chrome::NOTIFICATION_INSTANT_NTP_SUPPORT_DETERMINED,
       content::NotificationService::AllSources());
-  FocusOmnibox();

[samarth, 2013/08/12 19:07:28]

Are you sure this doesn't break any tests? You generally need to register the
observer before you do the action that triggers it.

In any case, this seems unrelated to this CL so please do it in a separate CL if
you do want to make the change.

[Anuj, 2013/08/13 00:18:09]

Removed. I was earlier trying to make use of InstantTestBase in the unit tests.
That exercise ran into issues, and I missed reverting this and the gypi change.

 
   InstantService* instant_service =
       InstantServiceFactory::GetForProfile(browser_->profile());
   ASSERT_NE(static_cast<InstantService*>(NULL), instant_service);
-  if (!instant_service->ntp_prerenderer()->ntp() ||
-      !instant_service->ntp_prerenderer()->ntp()->supports_instant())
+  InstantNTP* ntp = instant_service->ntp_prerenderer()->ntp();
+  if (!ntp || !ntp->supports_instant())
     ntp_observer.Wait();
 }
 
 void InstantTestBase::SetOmniboxText(const std::string& text) {
   FocusOmnibox();
   omnibox()->SetUserText(UTF8ToUTF16(text));
 }
 
 void InstantTestBase::PressEnterAndWaitForNavigation() {
   content::WindowedNotificationObserver nav_observer(
@@ skipping 56 matching lines @@
   return content::ExecuteScriptAndExtractBool(rvh, js_chrome, loaded);
 }
 
 string16 InstantTestBase::GetBlueText() {
   size_t start = 0, end = 0;
   omnibox()->GetSelectionBounds(&start, &end);
   if (start > end)
     std::swap(start, end);
   return omnibox()->GetText().substr(start, end - start);
 }