Remove BaseSearchProvider::set_in_app_list

chrome/browser/ui/app_list/search/omnibox_provider.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/ui/app_list/search/omnibox_provider.h"
 
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
-#include "chrome/browser/autocomplete/search_provider.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/app_list/search/chrome_search_result.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "components/autocomplete/autocomplete_input.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace app_list {
 
@@ skipping 40 matching lines @@
     tags->push_back(SearchResult::Tag(
         tag_styles, tag_start, text.length()));
   }
 }
 
 class OmniboxResult : public ChromeSearchResult {
  public:
   OmniboxResult(Profile* profile, const AutocompleteMatch& match)
       : profile_(profile),
         match_(match) {
+    if (match_.search_terms_args)
+      match_.search_terms_args->from_app_list = true;

[Peter Kasting, 2014/07/17 18:11:26]

Does this actually work?  I worry that we may not recompute the destination URL
after doing this.

[hashimoto, 2014/07/18 09:54:14]

That's a valid concern.
I should have been aware of the lack of test coverage around RLZ related code.
Manually verified that the new code generate different "rlz=" parameters
depending on whether the search is initiated from the omnibox or the app list.

In the new patch set, destination_url_ is overwritten with a new value.
Is it OK to overwrite the destination URL value outside of
AutocompleteController?
It's doing almost the same thing as calling
AutocompleteController::UpdateMatchDestinationURL from OmniboxEditModel.

[Peter Kasting, 2014/07/18 17:37:06]

I think it would be safer to actually call UpdateMatchDestinationURL() directly
instead of copying its functionality.  Is there any reason not to pass in the
AutocompleteController* to this constructor so we can do that?

[hashimoto, 2014/07/22 10:33:07]

I think UpdateMatchDestinationURL() cannot be used here because it takes
query_formulation_time and appends some parameter to the URL.
Should we add a new method to AutocompleteController which just recalculates the
URL?

[Peter Kasting, 2014/07/22 18:44:52]

If there's a way to refactor the existing code so that one method calls the
other, that seems fine.

[hashimoto, 2014/07/23 10:30:42]

Added a new method to AutocompleteController.

     set_id(match.destination_url.spec());
 
     // Derive relevance from omnibox relevance and normalize it to [0, 1].
     // The magic number 1500 is the highest score of an omnibox result.
     // See comments in autocomplete_provider.h.
     set_relevance(match.relevance / 1500.0);
 
     UpdateIcon();
     UpdateTitleAndDetails();
   }
@@ skipping 52 matching lines @@
 }  // namespace
 
 OmniboxProvider::OmniboxProvider(Profile* profile)
     : profile_(profile),
       controller_(new AutocompleteController(
           profile,
           TemplateURLServiceFactory::GetForProfile(profile),
           this,
           AutocompleteClassifier::kDefaultOmniboxProviders &
               ~AutocompleteProvider::TYPE_ZERO_SUGGEST)) {
-  controller_->search_provider()->set_in_app_list();
 }
 
 OmniboxProvider::~OmniboxProvider() {}
 
 void OmniboxProvider::Start(const base::string16& query) {
   controller_->Start(AutocompleteInput(
       query, base::string16::npos, base::string16(), GURL(),
       metrics::OmniboxEventProto::INVALID_SPEC, false, false, true, true,
       ChromeAutocompleteSchemeClassifier(profile_)));
 }
@@ skipping 13 matching lines @@
     Add(scoped_ptr<SearchResult>(new OmniboxResult(profile_, *it)));
   }
 }
 
 void OmniboxProvider::OnResultChanged(bool default_match_changed) {
   const AutocompleteResult& result = controller_->result();
   PopulateFromACResult(result);
 }
 
 }  // namespace app_list