| Index: chrome/browser/chromeos/login/managed/managed_user_test_base.h
|
| diff --git a/chrome/browser/chromeos/login/managed/managed_user_test_base.h b/chrome/browser/chromeos/login/managed/managed_user_test_base.h
|
| index e25cd5dae09f4a95b51e81c878837bd850f3e50f..5d1d655a6ed7e7e11cf1d0e8efcbd313b9586a0c 100644
|
| --- a/chrome/browser/chromeos/login/managed/managed_user_test_base.h
|
| +++ b/chrome/browser/chromeos/login/managed/managed_user_test_base.h
|
| @@ -7,10 +7,11 @@
|
| #include <string>
|
|
|
| #include "base/compiler_specific.h"
|
| -#include "chrome/browser/chromeos/login/login_manager_test.h"
|
| +#include "chrome/browser/chromeos/login/login_manager_test_helper.h"
|
| #include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"
|
| #include "chrome/browser/managed_mode/managed_user_registration_utility_stub.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| +#include "chrome/test/base/in_process_browser_test.h"
|
| #include "chromeos/cryptohome/mock_async_method_caller.h"
|
| #include "chromeos/cryptohome/mock_homedir_methods.h"
|
| #include "sync/api/fake_sync_change_processor.h"
|
| @@ -68,11 +69,13 @@ class ManagedUsersSharedSettingsSyncTestAdapter {
|
| int next_sync_data_id_;
|
| };
|
|
|
| -class ManagedUserTestBase : public chromeos::LoginManagerTest {
|
| +class ManagedUserTestBase : public InProcessBrowserTest {
|
| public:
|
| ManagedUserTestBase();
|
| virtual ~ManagedUserTestBase();
|
|
|
| + virtual void SetUpOnMainThread() OVERRIDE;
|
| + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
|
| virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
|
| virtual void CleanUpOnMainThread() OVERRIDE;
|
|
|
| @@ -105,6 +108,7 @@ class ManagedUserTestBase : public chromeos::LoginManagerTest {
|
| cryptohome::MockHomedirMethods* mock_homedir_methods_;
|
| NetworkPortalDetectorTestImpl* network_portal_detector_;
|
| ManagedUserRegistrationUtilityStub* registration_utility_stub_;
|
| + scoped_ptr<LoginManagerTestHelper> login_manager_test_helper_;
|
| scoped_ptr<ScopedTestingManagedUserRegistrationUtility> scoped_utility_;
|
| scoped_ptr<ManagedUsersSharedSettingsSyncTestAdapter>
|
| shared_settings_adapter_;
|
|
|