From 2ba30fe7f0c4640d3007b3357f0d0ab89637919e Mon Sep 17 00:00:00 2001 From: mukai Date: Fri, 10 Oct 2014 14:07:50 -0700 Subject: Adds full-functional search results for Athena on Chrome. BUG=380875, 421444 R=oshima@chromium.org, xiyuan@chromium.org TBR=pkasting@chromium.org, jar@chromium.org TEST=manually Review URL: https://codereview.chromium.org/640103002 Cr-Commit-Position: refs/heads/master@{#299186} --- athena/test/base/athena_test_helper.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'athena/test') diff --git a/athena/test/base/athena_test_helper.cc b/athena/test/base/athena_test_helper.cc index a46559e..dd9177e 100644 --- a/athena/test/base/athena_test_helper.cc +++ b/athena/test/base/athena_test_helper.cc @@ -5,7 +5,9 @@ #include "athena/test/base/athena_test_helper.h" #include "athena/env/public/athena_env.h" +#include "athena/extensions/public/apps_search_controller_factory.h" #include "athena/extensions/public/extensions_delegate.h" +#include "athena/home/public/search_controller_factory.h" #include "athena/main/public/athena_launcher.h" #include "athena/test/base/sample_activity_factory.h" #include "athena/test/base/test_app_model_builder.h" @@ -64,7 +66,8 @@ void AthenaTestHelper::SetUp(ui::ContextFactory* context_factory) { athena::StartAthenaEnv(file_thread_->message_loop_proxy()); athena::ExtensionsDelegate::CreateExtensionsDelegateForTest(); athena::StartAthenaSession(new SampleActivityFactory(), - new TestAppModelBuilder()); + make_scoped_ptr(new TestAppModelBuilder()), + CreateSearchControllerFactory(NULL)); } void AthenaTestHelper::TearDown() { -- cgit v1.1