Remove Client= relationship in omnibox.mojom

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 96 matching lines @@
   }
 };
 
 }  // namespace mojo
 
 OmniboxUIHandler::OmniboxUIHandler(Profile* profile)
     : profile_(profile) {
   ResetController();
 }
 
-OmniboxUIHandler::~OmniboxUIHandler() {}
+OmniboxUIHandler::~OmniboxUIHandler() {
+}
 
 void OmniboxUIHandler::OnResultChanged(bool default_match_changed) {
   OmniboxResultMojoPtr result(OmniboxResultMojo::New());
   result->done = controller_->done();
   result->time_since_omnibox_started_ms =
       (base::Time::Now() - time_omnibox_started_).InMilliseconds();
   const base::string16 host = input_.text().substr(
       input_.parts().host.begin,
       input_.parts().host.len);
   result->host = mojo::String::From(host);
@@ skipping 24 matching lines @@
     for (size_t i = 0; i < result->results_by_provider.size(); ++i) {
       const AutocompleteResultsForProviderMojo& result_by_provider =
           *result->results_by_provider[i];
       for (size_t j = 0; j < result_by_provider.results.size(); ++j) {
         result_by_provider.results[j]->starred = bookmark_model->IsBookmarked(
             GURL(result_by_provider.results[j]->destination_url));
       }
     }
   }
 
-  client()->HandleNewAutocompleteResult(result.Pass());
+  page_->HandleNewAutocompleteResult(result.Pass());
 }
 
 bool OmniboxUIHandler::LookupIsTypedHost(const base::string16& host,
                                          bool* is_typed_host) const {
   HistoryService* const history_service = HistoryServiceFactory::GetForProfile(
       profile_, ServiceAccessType::EXPLICIT_ACCESS);
   if (!history_service)
     return false;
   history::URLDatabase* url_db = history_service->InMemoryDatabase();
   if (!url_db)
     return false;
   *is_typed_host = url_db->IsTypedHost(base::UTF16ToUTF8(host));
   return true;
 }
 
 void OmniboxUIHandler::StartOmniboxQuery(const mojo::String& input_string,
                                          int32_t cursor_position,
                                          bool prevent_inline_autocomplete,
                                          bool prefer_keyword,
-                                         int32_t page_classification) {
+                                         int32_t page_classification,
+                                         OmniboxPagePtr page) {
   // 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();
+  page_ = page.Pass();
   time_omnibox_started_ = base::Time::Now();
   input_ = AutocompleteInput(
       input_string.To<base::string16>(), cursor_position, std::string(), GURL(),
       static_cast<metrics::OmniboxEventProto::PageClassification>(
           page_classification),
       prevent_inline_autocomplete, prefer_keyword, true, true,
       ChromeAutocompleteSchemeClassifier(profile_));
   controller_->Start(input_);
 }
 
 void OmniboxUIHandler::ResetController() {
   controller_.reset(new AutocompleteController(profile_,
           TemplateURLServiceFactory::GetForProfile(profile_),
           this,
           AutocompleteClassifier::kDefaultOmniboxProviders));
 }