[Merge to M53][Chrome OS] Change layout of the launcher.

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 "ui/app_list/search/mixer.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/scoped_vector.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string16.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/mock_entropy_provider.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_model.h"
 #include "ui/app_list/search/history_types.h"
 #include "ui/app_list/search_provider.h"
 #include "ui/app_list/search_result.h"
 
 namespace app_list {
 namespace test {
 
 // Maximum number of results to show in each mixer group.
 const size_t kMaxAppsGroupResults = 4;
@@ skipping 120 matching lines @@
   }
 
   void RunQuery() {
     const base::string16 query;
 
     for (size_t i = 0; i < providers_.size(); ++i) {
       providers_[i]->Start(is_voice_query_, query);
       providers_[i]->Stop();
     }
 
-    mixer_->MixAndPublish(is_voice_query_, known_results_);
+    mixer_->MixAndPublish(is_voice_query_, known_results_, kMaxSearchResults);
   }
 
   std::string GetResults() const {
     std::string result;
     for (size_t i = 0; i < results_->item_count(); ++i) {
       if (!result.empty())
         result += ',';
 
       result += base::UTF16ToUTF8(results_->GetItemAt(i)->title());
     }
@@ skipping 255 matching lines @@
   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)));
 }
 
 INSTANTIATE_TEST_CASE_P(MixerTestInstance, MixerTest, testing::Bool());
 
 }  // namespace test
 }  // namespace app_list