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

Side by Side Diff: chrome/browser/chromeos/login/managed/managed_user_test_base.h

Issue 366813007: Removed InProcessBrowserTest::CleanUpOnMainThread() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More merge to ToT. Created 6 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_MANAGED_USER_TEST_BASE_H_ 4 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_MANAGED_USER_TEST_BASE_H_
5 #define CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_MANAGED_USER_TEST_BASE_H_ 5 #define CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_MANAGED_USER_TEST_BASE_H_
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "chrome/browser/chromeos/login/login_manager_test.h" 10 #include "chrome/browser/chromeos/login/login_manager_test.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 SupervisedUserSharedSettingsService* service_; 65 SupervisedUserSharedSettingsService* service_;
66 int next_sync_data_id_; 66 int next_sync_data_id_;
67 }; 67 };
68 68
69 class ManagedUserTestBase : public chromeos::LoginManagerTest { 69 class ManagedUserTestBase : public chromeos::LoginManagerTest {
70 public: 70 public:
71 ManagedUserTestBase(); 71 ManagedUserTestBase();
72 virtual ~ManagedUserTestBase(); 72 virtual ~ManagedUserTestBase();
73 73
74 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE; 74 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
75 virtual void CleanUpOnMainThread() OVERRIDE; 75 virtual void TearDownOnMainThread() OVERRIDE;
76 76
77 protected: 77 protected:
78 virtual void TearDown() OVERRIDE; 78 virtual void TearDown() OVERRIDE;
79 79
80 virtual void TearDownInProcessBrowserTestFixture() OVERRIDE; 80 virtual void TearDownInProcessBrowserTestFixture() OVERRIDE;
81 81
82 void JSEval(const std::string& script); 82 void JSEval(const std::string& script);
83 83
84 void JSExpectAsync(const std::string& function); 84 void JSExpectAsync(const std::string& function);
85 85
(...skipping 22 matching lines...) Expand all
108 shared_settings_adapter_; 108 shared_settings_adapter_;
109 scoped_ptr<ManagedUsersSyncTestAdapter> managed_users_adapter_; 109 scoped_ptr<ManagedUsersSyncTestAdapter> managed_users_adapter_;
110 110
111 private: 111 private:
112 DISALLOW_COPY_AND_ASSIGN(ManagedUserTestBase); 112 DISALLOW_COPY_AND_ASSIGN(ManagedUserTestBase);
113 }; 113 };
114 114
115 } // namespace chromeos 115 } // namespace chromeos
116 116
117 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_MANAGED_USER_TEST_BASE_H_ 117 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_MANAGED_USER_TEST_BASE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698