Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(117)

Unified Diff: athena/test/base/athena_test_helper.cc

Issue 640103002: Adds full-functional search results for Athena on Chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix DEPS Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/main/url_search_provider.cc ('k') | chrome/browser/ui/app_list/search/app_result.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/test/base/athena_test_helper.cc
diff --git a/athena/test/base/athena_test_helper.cc b/athena/test/base/athena_test_helper.cc
index a46559e8813fc0bce82247d4cae80460fa140446..dd9177e02efae28f895207710caac898a920bad8 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() {
« no previous file with comments | « athena/main/url_search_provider.cc ('k') | chrome/browser/ui/app_list/search/app_result.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698