Simplifies the structure of app_list search a bit.

chrome/browser/ui/app_list/search/mixer_unittest.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 <string>
 
 #include "base/memory/scoped_vector.h"
 #include "base/strings/string16.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/ui/app_list/search/chrome_search_result.h"
 #include "chrome/browser/ui/app_list/search/history_types.h"
 #include "chrome/browser/ui/app_list/search/mixer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/app_list/app_list_model.h"
 #include "ui/app_list/search_provider.h"
+#include "ui/app_list/search_result.h"
 
 namespace app_list {
 namespace test {
 
-class TestSearchResult : public ChromeSearchResult {
+class TestSearchResult : public SearchResult {
  public:
   TestSearchResult(const std::string& id, double relevance)
       : instance_id_(instantiation_count++) {
     set_id(id);
     set_title(base::UTF8ToUTF16(id));
     set_relevance(relevance);
   }
   virtual ~TestSearchResult() {}
 
-  // ChromeSearchResult overides:
+  // SearchResult overrides:
   virtual void Open(int event_flags) override {}
   virtual void InvokeAction(int action_index, int event_flags) override {}
-  virtual scoped_ptr<ChromeSearchResult> Duplicate() override {
-    return scoped_ptr<ChromeSearchResult>(
-        new TestSearchResult(id(), relevance())).Pass();
-  }
-  virtual ChromeSearchResultType GetType() override {
-    return SEARCH_RESULT_TYPE_BOUNDARY;
+  virtual scoped_ptr<SearchResult> Duplicate() override {
+    return scoped_ptr<SearchResult>(new TestSearchResult(id(), relevance()));
   }
 
   // For reference equality testing. (Addresses cannot be used to test reference
   // equality because it is possible that an object will be allocated at the
   // same address as a previously deleted one.)
   static int GetInstanceId(SearchResult* result) {
     return static_cast<const TestSearchResult*>(result)->instance_id_;
   }
 
  private:
@@ skipping 139 matching lines @@
   webstore_provider()->set_prefix(dup);
   webstore_provider()->set_count(1);
 
   RunQuery();
 
   // Only three results with unique id are kept.
   EXPECT_EQ("dup0,dup1,dup2", GetResults());
 }
 
 TEST_F(MixerTest, Publish) {
-  scoped_ptr<ChromeSearchResult> result1(new TestSearchResult("app1", 0));
-  scoped_ptr<ChromeSearchResult> result2(new TestSearchResult("app2", 0));
-  scoped_ptr<ChromeSearchResult> result3(new TestSearchResult("app3", 0));
-  scoped_ptr<ChromeSearchResult> result3_copy = result3->Duplicate();
-  scoped_ptr<ChromeSearchResult> result4(new TestSearchResult("app4", 0));
-  scoped_ptr<ChromeSearchResult> result5(new TestSearchResult("app5", 0));
+  scoped_ptr<SearchResult> result1(new TestSearchResult("app1", 0));
+  scoped_ptr<SearchResult> result2(new TestSearchResult("app2", 0));
+  scoped_ptr<SearchResult> result3(new TestSearchResult("app3", 0));
+  scoped_ptr<SearchResult> result3_copy = result3->Duplicate();
+  scoped_ptr<SearchResult> result4(new TestSearchResult("app4", 0));
+  scoped_ptr<SearchResult> result5(new TestSearchResult("app5", 0));
 
   AppListModel::SearchResults ui_results;
 
   // Publish the first three results to |ui_results|.
   Mixer::SortedResults new_results;
   new_results.push_back(Mixer::SortData(result1.get(), 1.0f));
   new_results.push_back(Mixer::SortData(result2.get(), 1.0f));
   new_results.push_back(Mixer::SortData(result3.get(), 1.0f));
 
   Mixer::Publish(new_results, &ui_results);
@@ skipping 63 matching lines @@
   EXPECT_EQ(old_ui_result_ids[0],
             TestSearchResult::GetInstanceId(ui_results.GetItemAt(3)));
   EXPECT_EQ(old_ui_result_ids[1],
             TestSearchResult::GetInstanceId(ui_results.GetItemAt(0)));
   EXPECT_EQ(old_ui_result_ids[2],
             TestSearchResult::GetInstanceId(ui_results.GetItemAt(2)));
 }
 
 }  // namespace test
 }  // namespace app_list