| Index: chrome/browser/extensions/test_extension_environment.h
|
| diff --git a/chrome/browser/extensions/test_extension_environment.h b/chrome/browser/extensions/test_extension_environment.h
|
| index ad026785b1989f58ba8ce881a1c77f32fb70c25d..9a4a36b78cf0f380dcb5c8b9eda4f7ce97786098 100644
|
| --- a/chrome/browser/extensions/test_extension_environment.h
|
| +++ b/chrome/browser/extensions/test_extension_environment.h
|
| @@ -8,12 +8,6 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/message_loop/message_loop.h"
|
|
|
| -#if defined(OS_CHROMEOS)
|
| -#include "chrome/browser/chromeos/login/users/scoped_test_user_manager.h"
|
| -#include "chrome/browser/chromeos/settings/cros_settings.h"
|
| -#include "chrome/browser/chromeos/settings/device_settings_service.h"
|
| -#endif
|
| -
|
| #if defined(OS_WIN)
|
| #include "ui/base/win/scoped_ole_initializer.h"
|
| #endif
|
| @@ -89,13 +83,12 @@ class TestExtensionEnvironment {
|
| void DeleteProfile();
|
|
|
| private:
|
| - scoped_ptr<content::TestBrowserThreadBundle> thread_bundle_;
|
| + class ChromeOSEnv;
|
|
|
| -#if defined(OS_CHROMEOS)
|
| - chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
|
| - chromeos::ScopedTestCrosSettings test_cros_settings_;
|
| - chromeos::ScopedTestUserManager test_user_manager_;
|
| -#endif
|
| + void Init();
|
| +
|
| + scoped_ptr<content::TestBrowserThreadBundle> thread_bundle_;
|
| + scoped_ptr<ChromeOSEnv> chromeos_env_;
|
|
|
| #if defined(OS_WIN)
|
| ui::ScopedOleInitializer ole_initializer_;
|
|
|