Revert 249982 "Omnibox: Pass Input Box Type to AutocompleteClass..."

> Omnibox: Pass Input Box Type to AutocompleteClassifier
> 
> (where possible and reasonable)
> 
> This is a resubmission of https://codereview.chromium.org/138173007/
> that should have fixed the gtk compile error.
> 
> 
> Previously, the input box type (a.k.a. current page classification)
> (search results page doing search term replacement, arbitrary URL,
> new tab page omnibox, new tab page fakebox, etc.) was not passed to
> AutocompleteClassifier. This adds plumbing to pass the variable to
> the classifier in some cases. (Some other cases I decided were too
> much of a hassle to fix, and not important.)
> 
> TBR=brettw,pkasting
> brettw:
> for changes to chrome/browser/tab_contents/render_view_context_menu.cc
> pkasting:
> because he already reviewed it
> 
> BUG=265678
> 
> Review URL: https://codereview.chromium.org/157033005

TBR=mpearson@chromium.org

Review URL: https://codereview.chromium.org/158433003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249984 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 11 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_classifier.h b/chrome/browser/autocomplete/autocomplete_classifier.h
index 7ec95f5..8e9c760 100644
--- a/chrome/browser/autocomplete/autocomplete_classifier.h
+++ b/chrome/browser/autocomplete/autocomplete_classifier.h
@@ -9,7 +9,6 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
-#include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service.h"
 
 class AutocompleteController;
@@ -33,20 +32,16 @@ class AutocompleteClassifier : public BrowserContextKeyedService {
   // comments on AutocompleteController::Start().
   // |allow_exact_keyword_match| should be true when treating the string as a
   // potential keyword search is valid; see
-  // AutocompleteInput::allow_exact_keyword_match().
-  // |page_classification| gives information about the context (e.g., is the
-  // user on a search results page doing search term replacement); this may
-  // be useful in deciding how the input should be interpreted.
-  // |match| should be a non-NULL outparam that will be set to the default
-  // match for this input, if any (for invalid input, there will be no default
-  // match, and |match| will be left unchanged).  |alternate_nav_url| is a
-  // possibly-NULL outparam that, if non-NULL, will be set to the navigational
-  // URL (if any) in case of an accidental search; see comments on
+  // AutocompleteInput::allow_exact_keyword_match(). |match| should be a
+  // non-NULL outparam that will be set to the default match for this input, if
+  // any (for invalid input, there will be no default match, and |match| will be
+  // left unchanged).  |alternate_nav_url| is a possibly-NULL outparam that, if
+  // non-NULL, will be set to the navigational URL (if any) in case of an
+  // accidental search; see comments on
   // AutocompleteResult::alternate_nav_url_ in autocomplete.h.
   void Classify(const base::string16& text,
                 bool prefer_keyword,
                 bool allow_exact_keyword_match,
-                AutocompleteInput::PageClassification page_classification,
                 AutocompleteMatch* match,
                 GURL* alternate_nav_url);