Add unit test for Mixer::Publish.

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 <set>
 #include <string>
 #include <vector>
 
 #include "chrome/browser/ui/app_list/search/chrome_search_result.h"
 #include "ui/app_list/search_provider.h"
 
 namespace app_list {
 
 namespace {
 
+typedef std::vector<Mixer::SortData> SortedResults;
+
 // 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;
 
-// Used for sorting and mixing results.
-struct SortData {
-  SortData()
-      : result(NULL),
-        score(0.0) {
-  }
-  SortData(ChromeSearchResult* result, double score)
-      : result(result),
-        score(score) {
-  }
-
-  bool operator<(const SortData& other) const {
-    // This data precedes (less than) |other| if it has higher score.
-    return score > other.score;
-  }
-
-  ChromeSearchResult* result;  // Not owned.
-  double score;
-};
-typedef std::vector<SortData> SortedResults;
-
 // Removes duplicates from |results|.
 void RemoveDuplicates(SortedResults* results) {
   SortedResults final;
   final.reserve(results->size());
 
   std::set<std::string> id_set;
   for (SortedResults::iterator it = results->begin();
        it != results->end();
        ++it) {
     const std::string& id = it->result->id();
     if (id_set.find(id) != id_set.end())
       continue;
 
     id_set.insert(id);
     final.push_back(*it);
   }
 
   results->swap(final);
 }
 
-// Publishes the given |results| to |ui_results|. Reuse existing ones to avoid
-// flickering.
-void Publish(const SortedResults& results,
-             AppListModel::SearchResults* ui_results) {
-  for (size_t i = 0; i < results.size(); ++i) {
-    ChromeSearchResult* result = results[i].result;
-
-    ChromeSearchResult* ui_result = i < ui_results->item_count() ?
-        static_cast<ChromeSearchResult*>(ui_results->GetItemAt(i)) : NULL;
-    if (ui_result && ui_result->id() == result->id()) {
-      ui_result->set_title(result->title());
-      ui_result->set_title_tags(result->title_tags());
-      ui_result->set_details(result->details());
-      ui_result->set_details_tags(result->details_tags());
-      ui_results->NotifyItemsChanged(i, 1);
-    } else {
-      if (ui_result)
-        ui_results->DeleteAt(i);
-      ui_results->AddAt(i, result->Duplicate().release());
-    }
-  }
-
-  while (ui_results->item_count() > results.size())
-    ui_results->DeleteAt(ui_results->item_count() - 1);
-}
-
 }  // namespace
 
+Mixer::SortData::SortData() : result(NULL), score(0.0) {
+}
+
+Mixer::SortData::SortData(ChromeSearchResult* 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 {
  public:
   Group(size_t max_results, double boost)
       : max_results_(max_results),
         boost_(boost) {
   }
   ~Group() {}
 
   void AddProvider(SearchProvider* provider) {
@@ skipping 112 matching lines @@
                  groups_[OMNIBOX_GROUP]->results().begin() + remaining_slots);
 
   std::sort(results.begin(), results.end());
   RemoveDuplicates(&results);
   if (results.size() > kMaxResults)
     results.resize(kMaxResults);
 
   Publish(results, ui_results_);
 }
 
+void Mixer::Publish(const std::vector<SortData>& results,
+                    AppListModel::SearchResults* ui_results) {
+  for (size_t i = 0; i < results.size(); ++i) {
+    ChromeSearchResult* result = results[i].result;
+
+    ChromeSearchResult* ui_result =
+        i < ui_results->item_count()
+            ? static_cast<ChromeSearchResult*>(ui_results->GetItemAt(i))
+            : NULL;
+    if (ui_result && ui_result->id() == result->id()) {
+      ui_result->set_title(result->title());
+      ui_result->set_title_tags(result->title_tags());
+      ui_result->set_details(result->details());
+      ui_result->set_details_tags(result->details_tags());
+      ui_results->NotifyItemsChanged(i, 1);
+    } else {
+      if (ui_result)
+        ui_results->DeleteAt(i);
+      ui_results->AddAt(i, result->Duplicate().release());
+    }
+  }
+
+  while (ui_results->item_count() > results.size())
+    ui_results->DeleteAt(ui_results->item_count() - 1);
+}
+
 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