Index: chrome/browser/ui/search/instant_controller.cc |
diff --git a/chrome/browser/ui/search/instant_controller.cc b/chrome/browser/ui/search/instant_controller.cc |
index d1f628f8ce72dd1fa1e586082dbd0c4b3983ea73..ce732bcf3821eed29cdd9b698992505f4e095e97 100644 |
--- a/chrome/browser/ui/search/instant_controller.cc |
+++ b/chrome/browser/ui/search/instant_controller.cc |
@@ -8,34 +8,27 @@ |
#include <utility> |
#include "base/location.h" |
-#include "base/single_thread_task_runner.h" |
#include "base/strings/stringprintf.h" |
#include "base/threading/thread_task_runner_handle.h" |
#include "chrome/browser/chrome_notification_types.h" |
-#include "chrome/browser/platform_util.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/search/search.h" |
-#include "chrome/browser/search_engines/template_url_service_factory.h" |
#include "chrome/browser/ui/browser_instant_controller.h" |
#include "chrome/browser/ui/search/instant_tab.h" |
#include "chrome/browser/ui/search/search_tab_helper.h" |
-#include "chrome/common/chrome_switches.h" |
-#include "chrome/common/search/search_urls.h" |
-#include "chrome/common/url_constants.h" |
-#include "components/prefs/pref_service.h" |
-#include "components/search_engines/template_url_service.h" |
#include "components/sessions/core/serialized_navigation_entry.h" |
+#include "content/public/browser/navigation_controller.h" |
#include "content/public/browser/navigation_entry.h" |
#include "content/public/browser/notification_service.h" |
-#include "content/public/browser/render_process_host.h" |
-#include "content/public/browser/render_widget_host_view.h" |
#include "content/public/browser/web_contents.h" |
-#include "net/base/escape.h" |
-#include "net/base/network_change_notifier.h" |
#include "url/gurl.h" |
+// Macro used for logging debug events. |message| should be a std::string. |
+#define LOG_INSTANT_DEBUG_EVENT(controller, message) \ |
+ controller->LogDebugEvent(message) |
+ |
namespace { |
bool IsContentsFrom(const InstantPage* page, |
@@ -175,7 +168,7 @@ void InstantController::ResetInstantTab() { |
if (!search_mode_.is_origin_default()) { |
content::WebContents* active_tab = browser_->GetActiveWebContents(); |
if (!instant_tab_ || active_tab != instant_tab_->web_contents()) { |
- instant_tab_.reset(new InstantTab(this, browser_->profile())); |
+ instant_tab_.reset(new InstantTab(this)); |
instant_tab_->Init(active_tab); |
UpdateInfoForInstantTab(); |
} |