| 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 83eabafe009fac9f5002f393f151af1c3871573a..84c1689a75ca11cd07f423294fd8bd77c45b32f4 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
|
| @@ -7,6 +7,7 @@
|
| #include <string>
|
|
|
| #include "base/files/file_path.h"
|
| +#include "base/files/scoped_temp_dir.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/prefs/pref_service.h"
|
| #include "base/run_loop.h"
|
| @@ -14,11 +15,13 @@
|
| #include "chrome/browser/extensions/extension_function_test_utils.h"
|
| #include "chrome/browser/extensions/install_tracker.h"
|
| #include "chrome/browser/extensions/install_tracker_factory.h"
|
| +#include "chrome/browser/profiles/profile_manager.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/common/chrome_constants.h"
|
| #include "chrome/common/extensions/extension_constants.h"
|
| #include "chrome/common/pref_names.h"
|
| +#include "chrome/test/base/testing_browser_process.h"
|
| #include "chrome/test/base/testing_profile.h"
|
| #include "extensions/browser/app_sorting.h"
|
| #include "extensions/browser/extension_prefs.h"
|
| @@ -108,11 +111,16 @@ class ExtensionAppModelBuilderTest : public AppListTestBase {
|
| virtual void SetUp() OVERRIDE {
|
| AppListTestBase::SetUp();
|
|
|
| + ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
|
| + TestingBrowserProcess::GetGlobal()->SetProfileManager(
|
| + new ProfileManagerWithoutInit(temp_dir_.path()));
|
| +
|
| CreateBuilder();
|
| }
|
|
|
| virtual void TearDown() OVERRIDE {
|
| ResetBuilder();
|
| + TestingBrowserProcess::GetGlobal()->SetProfileManager(NULL);
|
| }
|
|
|
| protected:
|
| @@ -136,7 +144,7 @@ class ExtensionAppModelBuilderTest : public AppListTestBase {
|
| scoped_ptr<TestAppListControllerDelegate> controller_;
|
| scoped_ptr<ExtensionAppModelBuilder> builder_;
|
|
|
| - base::ScopedTempDir second_profile_temp_dir_;
|
| + base::ScopedTempDir temp_dir_;
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(ExtensionAppModelBuilderTest);
|
|
|