Instant: Use only one hidden WebContents per profile.

chrome/browser/ui/webui/instant_ui.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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/webui/instant_ui.h"
 
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "base/stringprintf.h"
-#include "base/time.h"
-#include "chrome/browser/instant/instant_controller.h"
+#include "chrome/browser/instant/instant_service.h"
+#include "chrome/browser/instant/instant_service_factory.h"
 #include "chrome/browser/prefs/pref_registry_syncable.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_finder.h"
-#include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "grit/browser_resources.h"
 
 namespace {
 
 content::WebUIDataSource* CreateInstantHTMLSource() {
@@ skipping 17 matching lines @@
 // This class receives JavaScript messages from the renderer.
 // Note that the WebUI infrastructure runs on the UI thread, therefore all of
 // this class's methods are expected to run on the UI thread.
 class InstantUIMessageHandler
     : public content::WebUIMessageHandler,
       public base::SupportsWeakPtr<InstantUIMessageHandler> {
  public:
   InstantUIMessageHandler();
   virtual ~InstantUIMessageHandler();
 
-  // WebUIMessageHandler implementation.
+ private:
+  // Overridden from content::WebUIMessageHandler:
   virtual void RegisterMessages() OVERRIDE;
 
- private:
   void GetPreferenceValue(const base::ListValue* args);
   void SetPreferenceValue(const base::ListValue* args);
   void GetDebugInfo(const base::ListValue* value);
 
   DISALLOW_COPY_AND_ASSIGN(InstantUIMessageHandler);
 };
 
-InstantUIMessageHandler::InstantUIMessageHandler() {}
+InstantUIMessageHandler::InstantUIMessageHandler() {
+}
 
-InstantUIMessageHandler::~InstantUIMessageHandler() {}
+InstantUIMessageHandler::~InstantUIMessageHandler() {
+}
 
 void InstantUIMessageHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback(
       "getPreferenceValue",
       base::Bind(&InstantUIMessageHandler::GetPreferenceValue,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "setPreferenceValue",
       base::Bind(&InstantUIMessageHandler::SetPreferenceValue,
                  base::Unretained(this)));
@@ skipping 23 matching lines @@
   if (pref_name == prefs::kInstantUIZeroSuggestUrlPrefix) {
     std::string value;
     if (!args->GetString(1, &value))
       return;
     PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
     prefs->SetString(pref_name.c_str(), value);
   }
 }
 
 void InstantUIMessageHandler::GetDebugInfo(const base::ListValue* args) {
-#if !defined(OS_ANDROID)
-  typedef std::pair<int64, std::string> DebugEvent;
-
-  if (!web_ui()->GetWebContents())
-    return;
-  Browser* browser = chrome::FindBrowserWithWebContents(
-      web_ui()->GetWebContents());
-  if (!browser || !browser->instant_controller())
+  InstantService* service =
+      InstantServiceFactory::GetForProfile(Profile::FromWebUI(web_ui()));
+  if (!service)
     return;
 
-  InstantController* instant = browser->instant_controller()->instant();
-  const std::list<DebugEvent>& events = instant->debug_events();
+  typedef std::list<std::pair<int64, std::string> > DebugEventList;
+  const DebugEventList& events = service->debug_events();
 
   base::DictionaryValue data;
   base::ListValue* entries = new base::ListValue();
-  for (std::list<DebugEvent>::const_iterator it = events.begin();
-       it != events.end(); ++it) {
+  for (DebugEventList::const_iterator it = events.begin(); it != events.end();
+       ++it) {
     base::DictionaryValue* entry = new base::DictionaryValue();
     entry->SetString("time", FormatTime(it->first));
     entry->SetString("text", it->second);
     entries->Append(entry);
   }
   data.Set("entries", entries);
 
   web_ui()->CallJavascriptFunction("instantConfig.getDebugInfoResult", data);
-#endif
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // InstantUI
 
 InstantUI::InstantUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new InstantUIMessageHandler());
 
   // Set up the chrome://instant/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
   content::WebUIDataSource::Add(profile, CreateInstantHTMLSource());
 }
 
+InstantUI::~InstantUI() {
+}
+
 // static
 void InstantUI::RegisterUserPrefs(PrefRegistrySyncable* registry) {
   registry->RegisterStringPref(prefs::kInstantUIZeroSuggestUrlPrefix, "",
                                PrefRegistrySyncable::UNSYNCABLE_PREF);
 }