Instant: small cleanups

chrome/browser/ui/search/instant_controller.cc

 // Copyright 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/search/instant_controller.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/location.h"
 #include "base/strings/stringprintf.h"
-#include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
 #include "content/public/browser/web_contents.h"
 #include "url/gurl.h"
 
 namespace {
 
 bool IsContentsFrom(const InstantTab* page,
                     const content::WebContents* contents) {
   return page && (page->web_contents() == contents);
 }
 
 }  // namespace
 
 InstantController::InstantController(BrowserInstantController* browser)
-    : browser_(browser) {
-}
+    : browser_(browser) {}
 
-InstantController::~InstantController() {
-}
+InstantController::~InstantController() = default;
 
 void InstantController::SearchModeChanged(const SearchMode& old_mode,
                                           const SearchMode& new_mode) {
   LogDebugEvent(base::StringPrintf(
       "SearchModeChanged: [origin:mode] %d:%d to %d:%d", old_mode.origin,
       old_mode.mode, new_mode.origin, new_mode.mode));
 
   search_mode_ = new_mode;
   ResetInstantTab();
 }
@@ skipping 15 matching lines @@
 
 void InstantController::ClearDebugEvents() {
   debug_events_.clear();
 }
 
 void InstantController::InstantTabAboutToNavigateMainFrame(
     const content::WebContents* contents,
     const GURL& url) {
   DCHECK(IsContentsFrom(instant_tab_.get(), contents));
 
-  // The Instant tab navigated.  Send it the data it needs to display
-  // properly.
-  // TODO(treib): Doesn't seem to be necessary. crbug.com/627747
+  // The Instant tab navigated (which means it had instant support both before
+  // and after the navigation). This may cause it to be assigned to a new
+  // renderer process, which doesn't have the most visited/theme data yet, so
+  // send it now.
+  // TODO(treib): This seems unnecessarily convoluted and fragile. Can't we just
+  // send this when the Instant process is created?
   UpdateInfoForInstantTab();
 }
 
 void InstantController::ResetInstantTab() {
   if (search_mode_.is_origin_ntp()) {
     content::WebContents* active_tab = browser_->GetActiveWebContents();
     if (!instant_tab_ || active_tab != instant_tab_->web_contents()) {
       instant_tab_.reset(new InstantTab(this, active_tab));
       instant_tab_->Init();
       UpdateInfoForInstantTab();
     }
   } else {
     instant_tab_.reset();
   }
 }
 
 void InstantController::UpdateInfoForInstantTab() {
   DCHECK(instant_tab_);
   InstantService* instant_service = GetInstantService();
   if (instant_service) {
     instant_service->UpdateThemeInfo();
     instant_service->UpdateMostVisitedItemsInfo();
   }
 }
 
 InstantService* InstantController::GetInstantService() const {
   return InstantServiceFactory::GetForProfile(browser_->profile());
 }