diff options
| author | mukai <mukai@chromium.org> | 2014-10-10 14:07:50 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-10 21:08:08 +0000 |
| commit | 2ba30fe7f0c4640d3007b3357f0d0ab89637919e (patch) | |
| tree | a41089d1a6e4e1d6c1751c1be7092105e490ff82 /athena/test | |
| parent | 3f6b84cd4ebdc209f3d607f2336e6f43aadcd2df (diff) | |
| download | chromium_src-2ba30fe7f0c4640d3007b3357f0d0ab89637919e.zip chromium_src-2ba30fe7f0c4640d3007b3357f0d0ab89637919e.tar.gz chromium_src-2ba30fe7f0c4640d3007b3357f0d0ab89637919e.tar.bz2 | |
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}
Diffstat (limited to 'athena/test')
| -rw-r--r-- | athena/test/base/athena_test_helper.cc | 5 |
1 files changed, 4 insertions, 1 deletions
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() { |