Index: chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc |
diff --git a/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc b/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc |
index ae75068abed75d85f15ac67b72778a6f1b5ee768..a228aca20aae0ecff94d4781e68f0afae5c7123a 100644 |
--- a/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc |
+++ b/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc |
@@ -15,8 +15,8 @@ |
#include "chrome/browser/extensions/extension_service.h" |
#include "chrome/browser/extensions/install_tracker.h" |
#include "chrome/browser/extensions/install_tracker_factory.h" |
-#include "chrome/browser/ui/app_list/app_list_controller_delegate_impl.h" |
#include "chrome/browser/ui/app_list/app_list_test_util.h" |
+#include "chrome/browser/ui/app_list/test/test_app_list_controller_delegate.h" |
#include "chrome/common/chrome_constants.h" |
#include "chrome/common/extensions/extension_constants.h" |
#include "chrome/common/pref_names.h" |
@@ -64,40 +64,6 @@ scoped_refptr<extensions::Extension> MakeApp(const std::string& name, |
return app; |
} |
-class TestAppListControllerDelegate : public AppListControllerDelegate { |
- public: |
- virtual ~TestAppListControllerDelegate() {} |
- virtual void DismissView() override {} |
- virtual gfx::NativeWindow GetAppListWindow() override { return NULL; } |
- virtual gfx::ImageSkia GetWindowIcon() override { return gfx::ImageSkia(); } |
- virtual bool IsAppPinned(const std::string& extension_id) override { |
- return false; |
- } |
- virtual void PinApp(const std::string& extension_id) override {} |
- virtual void UnpinApp(const std::string& extension_id) override {} |
- virtual Pinnable GetPinnable() override { return NO_PIN; } |
- virtual bool CanDoCreateShortcutsFlow() override { return false; } |
- virtual void DoCreateShortcutsFlow(Profile* profile, |
- const std::string& extension_id) override { |
- } |
- virtual bool CanDoShowAppInfoFlow() override { return false; } |
- virtual void DoShowAppInfoFlow(Profile* profile, |
- const std::string& extension_id) override { |
- }; |
- virtual void CreateNewWindow(Profile* profile, bool incognito) override {} |
- virtual void ActivateApp(Profile* profile, |
- const extensions::Extension* extension, |
- AppListSource source, |
- int event_flags) override {} |
- virtual void LaunchApp(Profile* profile, |
- const extensions::Extension* extension, |
- AppListSource source, |
- int event_flags) override {} |
- virtual void ShowForProfileByPath( |
- const base::FilePath& profile_path) override {} |
- virtual bool ShouldShowUserIcon() override { return false; } |
-}; |
- |
const char kDefaultApps[] = "Packaged App 1,Packaged App 2,Hosted App"; |
const size_t kDefaultAppCount = 3u; |
@@ -124,7 +90,7 @@ class ExtensionAppModelBuilderTest : public AppListTestBase { |
ResetBuilder(); // Destroy any existing builder in the correct order. |
model_.reset(new app_list::AppListModel); |
- controller_.reset(new TestAppListControllerDelegate); |
+ controller_.reset(new test::TestAppListControllerDelegate); |
builder_.reset(new ExtensionAppModelBuilder(controller_.get())); |
builder_->InitializeWithProfile(profile_.get(), model_.get()); |
} |
@@ -136,7 +102,7 @@ class ExtensionAppModelBuilderTest : public AppListTestBase { |
} |
scoped_ptr<app_list::AppListModel> model_; |
- scoped_ptr<TestAppListControllerDelegate> controller_; |
+ scoped_ptr<test::TestAppListControllerDelegate> controller_; |
scoped_ptr<ExtensionAppModelBuilder> builder_; |
base::ScopedTempDir second_profile_temp_dir_; |