Consolidate search terms extraction and Instant process determination.

chrome/browser/instant/instant_overlay.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/instant/instant_overlay.h"
 
 #include "base/auto_reset.h"
 #include "base/supports_user_data.h"
+#include "chrome/browser/ui/search/search.h"
 #include "content/public/browser/web_contents.h"
 
 namespace {
 
 int kUserDataKey;
 
 class InstantOverlayUserData : public base::SupportsUserData::Data {
  public:
   explicit InstantOverlayUserData(InstantOverlay* overlay)
       : overlay_(overlay) {}
@@ skipping 45 matching lines @@
   SetContents(NULL);
   return loader_.ReleaseContents();
 }
 
 void InstantOverlay::DidNavigate(
     const history::HistoryAddPageArgs& add_page_args) {
   last_navigation_ = add_page_args;
 }
 
 bool InstantOverlay::IsUsingLocalPreview() const {
-  return instant_url_ == InstantController::kLocalOmniboxPopupURL;
+  return instant_url_ == chrome::search::kLocalOmniboxPopupURL;
 }
 
 void InstantOverlay::Update(const string16& text,
                             size_t selection_start,
                             size_t selection_end,
                             bool verbatim) {
   last_navigation_ = history::HistoryAddPageArgs();
   InstantPage::Update(text, selection_start, selection_end, verbatim);
 }
 
@@ skipping 60 matching lines @@
     DCHECK_NE(&loader_, overlay->GetDelegate());
     return overlay->GetDelegate()->OpenURLFromTab(source, params);
   }
   return NULL;
 }
 
 void InstantOverlay::HandleStalePage() {
   is_stale_ = true;
   instant_controller()->ReloadOverlayIfStale();
 }