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

Side by Side Diff: chrome/browser/chromeos/login/supervised/supervised_user_test_base.h

Issue 366813007: Removed InProcessBrowserTest::CleanUpOnMainThread() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed superfluous override. 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_SUPERVISED_SUPERVISED_USER_TEST_BASE_H_ 4 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_TEST_BASE_H_
5 #define CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_TEST_BASE_H_ 5 #define CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 SupervisedUserSharedSettingsService* service_; 63 SupervisedUserSharedSettingsService* service_;
64 int next_sync_data_id_; 64 int next_sync_data_id_;
65 }; 65 };
66 66
67 class SupervisedUserTestBase : public chromeos::LoginManagerTest { 67 class SupervisedUserTestBase : public chromeos::LoginManagerTest {
68 public: 68 public:
69 SupervisedUserTestBase(); 69 SupervisedUserTestBase();
70 virtual ~SupervisedUserTestBase(); 70 virtual ~SupervisedUserTestBase();
71 71
72 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE; 72 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
73 virtual void CleanUpOnMainThread() OVERRIDE;
74 73
75 protected: 74 protected:
76 virtual void TearDown() OVERRIDE; 75 virtual void TearDown() OVERRIDE;
77 76
78 virtual void TearDownInProcessBrowserTestFixture() OVERRIDE; 77 virtual void TearDownInProcessBrowserTestFixture() OVERRIDE;
79 78
80 void JSEval(const std::string& script); 79 void JSEval(const std::string& script);
81 80
82 void JSExpectAsync(const std::string& function); 81 void JSExpectAsync(const std::string& function);
83 82
(...skipping 22 matching lines...) Expand all
106 shared_settings_adapter_; 105 shared_settings_adapter_;
107 scoped_ptr<SupervisedUsersSyncTestAdapter> supervised_users_adapter_; 106 scoped_ptr<SupervisedUsersSyncTestAdapter> supervised_users_adapter_;
108 107
109 private: 108 private:
110 DISALLOW_COPY_AND_ASSIGN(SupervisedUserTestBase); 109 DISALLOW_COPY_AND_ASSIGN(SupervisedUserTestBase);
111 }; 110 };
112 111
113 } // namespace chromeos 112 } // namespace chromeos
114 113
115 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_TEST_BASE_H_ 114 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_TEST_BASE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698