Simplifies the structure of app_list search a bit.

chrome/browser/ui/app_list/search/mixer.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/mixer.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
-#include "chrome/browser/ui/app_list/search/chrome_search_result.h"
 #include "ui/app_list/search_provider.h"
+#include "ui/app_list/search_result.h"
 
 namespace app_list {
 
 namespace {
 
 // Maximum number of results to show.
 const size_t kMaxResults = 6;
 const size_t kMaxMainGroupResults = 4;
 const size_t kMaxWebstoreResults = 2;
 const size_t kMaxPeopleResults = 2;
 
 // A value to indicate no max number of results limit.
 const size_t kNoMaxResultsLimit = 0;
 
-void UpdateResult(const ChromeSearchResult& source,
-                  ChromeSearchResult* target) {
+void UpdateResult(const SearchResult& source,
+                  SearchResult* target) {
   target->set_title(source.title());
   target->set_title_tags(source.title_tags());
   target->set_details(source.details());
   target->set_details_tags(source.details_tags());
 }
 
 }  // namespace
 
 Mixer::SortData::SortData() : result(NULL), score(0.0) {
 }
 
-Mixer::SortData::SortData(ChromeSearchResult* result, double score)
+Mixer::SortData::SortData(SearchResult* result, double score)
     : result(result), score(score) {
 }
 
 bool Mixer::SortData::operator<(const SortData& other) const {
   // This data precedes (less than) |other| if it has higher score.
   return score > other.score;
 }
 
 // Used to group relevant providers together fox mixing their results.
 class Mixer::Group {
@@ skipping 39 matching lines @@
             case PREFIX_SECONDARY:
               boost = 3.0;
               break;
             case UNKNOWN_RESULT:
               NOTREACHED() << "Unknown result in KnownResults?";
               break;
           }
         }
 
         results_.push_back(
-            SortData(static_cast<ChromeSearchResult*>(*result_it),
-                     (*result_it)->relevance() + boost));
+            SortData(*result_it, (*result_it)->relevance() + boost));
       }
     }
 
     std::sort(results_.begin(), results_.end());
     if (max_results_ != kNoMaxResultsLimit && results_.size() > max_results_)
       results_.resize(max_results_);
   }
 
   const SortedResults& results() const { return results_; }
 
@@ skipping 61 matching lines @@
   std::sort(results.begin(), results.end());
   RemoveDuplicates(&results);
   if (results.size() > kMaxResults)
     results.resize(kMaxResults);
 
   Publish(results, ui_results_);
 }
 
 void Mixer::Publish(const SortedResults& new_results,
                     AppListModel::SearchResults* ui_results) {
-  typedef std::map<std::string, ChromeSearchResult*> IdToResultMap;
+  typedef std::map<std::string, SearchResult*> IdToResultMap;
 
   // The following algorithm is used:
   // 1. Transform the |ui_results| list into an unordered map from result ID
   // to item.
   // 2. Use the order of items in |new_results| to build an ordered list. If the
   // result IDs exist in the map, update and use the item in the map and delete
   // it from the map afterwards. Otherwise, clone new items from |new_results|.
   // 3. Delete the objects remaining in the map as they are unused.
 
   // A map of the items in |ui_results| that takes ownership of the items.
   IdToResultMap ui_results_map;
   for (size_t i = 0; i < ui_results->item_count(); ++i) {
-    ChromeSearchResult* ui_result =
-        static_cast<ChromeSearchResult*>(ui_results->GetItemAt(i));
+    SearchResult* ui_result = ui_results->GetItemAt(i);
     ui_results_map[ui_result->id()] = ui_result;
   }
   // We have to erase all results at once so that observers are notified with
   // meaningful indexes.
   ui_results->RemoveAll();
 
   // Add items back to |ui_results| in the order of |new_results|.
   for (size_t i = 0; i < new_results.size(); ++i) {
-    ChromeSearchResult* new_result = new_results[i].result;
+    SearchResult* new_result = new_results[i].result;
     IdToResultMap::const_iterator ui_result_it =
         ui_results_map.find(new_result->id());
     if (ui_result_it != ui_results_map.end()) {
       // Update and use the old result if it exists.
-      ChromeSearchResult* ui_result = ui_result_it->second;
+      SearchResult* ui_result = ui_result_it->second;
       UpdateResult(*new_result, ui_result);
 
       // |ui_results| takes back ownership from |ui_results_map| here.
       ui_results->Add(ui_result);
 
       // Remove the item from the map so that it ends up only with unused
       // results.
       ui_results_map.erase(ui_result->id());
     } else {
       // Copy the result from |new_results| otherwise.
@@ skipping 29 matching lines @@
 
 void Mixer::FetchResults(const KnownResults& known_results) {
   for (Groups::iterator group_it = groups_.begin();
        group_it != groups_.end();
        ++group_it) {
     (*group_it)->FetchResults(known_results);
   }
 }
 
 }  // namespace app_list