InstantExtended: Send search URLs to renderers.

chrome/browser/search/instant_service.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/search/instant_service.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/most_visited_tiles_experiment.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_io_context.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/instant_service_observer.h"
 #include "chrome/browser/search/local_ntp_source.h"
 #include "chrome/browser/search/most_visited_iframe_source.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/browser/ui/webui/ntp/thumbnail_source.h"
 #include "chrome/browser/ui/webui/theme_source.h"
+#include "chrome/common/render_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/url_data_source.h"
 #include "grit/theme_resources.h"
 #include "net/url_request/url_request.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/sys_color_change_listener.h"
@@ skipping 20 matching lines @@
 InstantService::InstantService(Profile* profile)
     : profile_(profile),
       ntp_prerenderer_(profile, profile->GetPrefs()),
       browser_instant_controller_object_count_(0),
       weak_ptr_factory_(this) {
   // Stub for unit tests.
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI))
     return;
 
   registrar_.Add(this,
+                 content::NOTIFICATION_RENDERER_PROCESS_CREATED,
+                 content::NotificationService::AllSources());
+  registrar_.Add(this,
                  content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
                  content::NotificationService::AllSources());
 
   history::TopSites* top_sites = profile_->GetTopSites();
   if (top_sites) {
     registrar_.Add(this,
                    chrome::NOTIFICATION_TOP_SITES_CHANGED,
                    content::Source<history::TopSites>(top_sites));
   }
   instant_io_context_ = new InstantIOContext();
@@ skipping 130 matching lines @@
   // All browser windows have closed, so release the InstantNTP resources to
   // work around http://crbug.com/180810.
   if (browser_instant_controller_object_count_ == 0)
     ntp_prerenderer_.DeleteNTPContents();
 }
 
 void InstantService::Observe(int type,
                              const content::NotificationSource& source,
                              const content::NotificationDetails& details) {
   switch (type) {
-    case content::NOTIFICATION_RENDERER_PROCESS_TERMINATED: {
-      int process_id =
-          content::Source<content::RenderProcessHost>(source)->GetID();
-      process_ids_.erase(process_id);
-
-      if (instant_io_context_.get()) {
-        BrowserThread::PostTask(
-            BrowserThread::IO,
-            FROM_HERE,
-            base::Bind(&InstantIOContext::RemoveInstantProcessOnIO,
-                       instant_io_context_,
-                       process_id));
-      }
+    case content::NOTIFICATION_RENDERER_PROCESS_CREATED:
+      SendSearchURLsToRenderer(
+          content::Source<content::RenderProcessHost>(source).ptr());
       break;
-    }
+    case content::NOTIFICATION_RENDERER_PROCESS_TERMINATED:
+      OnRendererProcessTerminated(
+          content::Source<content::RenderProcessHost>(source)->GetID());
+      break;
     case chrome::NOTIFICATION_TOP_SITES_CHANGED: {
       history::TopSites* top_sites = profile_->GetTopSites();
       if (top_sites) {
         top_sites->GetMostVisitedURLs(
             base::Bind(&InstantService::OnMostVisitedItemsReceived,
                        weak_ptr_factory_.GetWeakPtr()));
       }
       break;
     }
 #if defined(ENABLE_THEMES)
@@ skipping 10 matching lines @@
       // and Profile destruction.
       if (GetNTPContents())
         ntp_prerenderer_.DeleteNTPContents();
       break;
     }
     default:
       NOTREACHED() << "Unexpected notification type in InstantService.";
   }
 }
 
+void InstantService::SendSearchURLsToRenderer(content::RenderProcessHost* rph) {

[samarth, 2013/09/20 16:43:40]

Test please. Anuj's pending change adds a unit test framework for InstantService
so I'm OK if you want to wait for that to land and then add a test after.

[Jered, 2013/09/20 20:55:49]

I added a simple test. I'll merge up to Anuj's change if that goes in first.

+  rph->Send(new ChromeViewMsg_SetSearchURLs(
+      chrome::GetSearchURLs(profile_), chrome::GetNewTabPageURL(profile_)));
+}
+
+void InstantService::OnRendererProcessTerminated(int process_id) {
+  process_ids_.erase(process_id);
+
+  if (instant_io_context_.get()) {
+    BrowserThread::PostTask(
+        BrowserThread::IO,
+        FROM_HERE,
+        base::Bind(&InstantIOContext::RemoveInstantProcessOnIO,
+                   instant_io_context_,
+                   process_id));
+  }
+}
+
 void InstantService::OnMostVisitedItemsReceived(
     const history::MostVisitedURLList& data) {
   history::MostVisitedURLList reordered_data(data);
   history::MostVisitedTilesExperiment::MaybeShuffle(&reordered_data);
 
   std::vector<InstantMostVisitedItem> new_most_visited_items;
   for (size_t i = 0; i < reordered_data.size(); i++) {
     const history::MostVisitedURL& url = reordered_data[i];
     InstantMostVisitedItem item;
     item.url = url.url;
@@ skipping 114 matching lines @@
        theme_service->HasCustomImage(IDR_THEME_NTP_ATTRIBUTION);
   }
 
   FOR_EACH_OBSERVER(InstantServiceObserver, observers_,
                     ThemeInfoChanged(*theme_info_));
 }
 
 InstantNTPPrerenderer* InstantService::ntp_prerenderer() {
   return &ntp_prerenderer_;
 }