Upstreaming mechanism to add query refinement to omnibox searches.

chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc

 // Copyright (c) 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/omnibox/omnibox_ui_handler.h"
 
 #include <string>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 137 matching lines @@
   return_val = input->GetInteger(1, &cursor_position_int);
   DCHECK(return_val);
   size_t cursor_position = cursor_position_int;
   bool prevent_inline_autocomplete;
   return_val = input->GetBoolean(2, &prevent_inline_autocomplete);
   DCHECK(return_val);
   bool prefer_keyword;
   return_val = input->GetBoolean(3, &prefer_keyword);
   DCHECK(return_val);
   string16 empty_string;
+  GURL empty_url;

[Peter Kasting, 2013/03/22 20:20:06]

Nit: Let's nuke |empty_string| and |empty_url| and just pass string16() and
GURL() below.

We can probably also nuke |cursor_position| and rename |cursor_position_int| to
|cursor_position|, since I suspect the compiler will auto-upcast if we provide
an int as an arg in the call.

[beaudoin, 2013/03/22 23:10:43]

Done.

   // Reset the controller.  If we don't do this, then the
   // AutocompleteController might inappropriately set its |minimal_changes|
   // variable (or something else) and some providers will short-circuit
   // important logic and return stale results.  In short, we want the
   // actual results to not depend on the state of the previous request.
   ResetController();
   time_omnibox_started_ = base::Time::Now();
   controller_->Start(AutocompleteInput(
       input_string,
       cursor_position,
       empty_string,  // user's desired tld (top-level domain)
+      empty_url,
       prevent_inline_autocomplete,
       prefer_keyword,
       true,  // allow exact keyword matches
       AutocompleteInput::ALL_MATCHES));  // want all matches
 }
 
 void OmniboxUIHandler::ResetController() {
   controller_.reset(new AutocompleteController(profile_, this,
       chrome::search::IsInstantExtendedAPIEnabled() ?
           AutocompleteClassifier::kInstantExtendedOmniboxProviders :
           AutocompleteClassifier::kDefaultOmniboxProviders));
 }