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

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

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h Created 6 years, 2 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
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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 syncer::FakeSyncChangeProcessor* processor_; 62 syncer::FakeSyncChangeProcessor* processor_;
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 73
74 protected: 74 protected:
75 virtual void TearDown() OVERRIDE; 75 virtual void TearDown() override;
76 76
77 virtual void TearDownInProcessBrowserTestFixture() OVERRIDE; 77 virtual void TearDownInProcessBrowserTestFixture() override;
78 78
79 void JSEval(const std::string& script); 79 void JSEval(const std::string& script);
80 80
81 void JSExpectAsync(const std::string& function); 81 void JSExpectAsync(const std::string& function);
82 82
83 void JSSetTextField(const std::string& element_selector, 83 void JSSetTextField(const std::string& element_selector,
84 const std::string& value); 84 const std::string& value);
85 85
86 void PrepareUsers(); 86 void PrepareUsers();
87 void StartFlowLoginAsManager(); 87 void StartFlowLoginAsManager();
(...skipping 17 matching lines...) Expand all
105 shared_settings_adapter_; 105 shared_settings_adapter_;
106 scoped_ptr<SupervisedUsersSyncTestAdapter> supervised_users_adapter_; 106 scoped_ptr<SupervisedUsersSyncTestAdapter> supervised_users_adapter_;
107 107
108 private: 108 private:
109 DISALLOW_COPY_AND_ASSIGN(SupervisedUserTestBase); 109 DISALLOW_COPY_AND_ASSIGN(SupervisedUserTestBase);
110 }; 110 };
111 111
112 } // namespace chromeos 112 } // namespace chromeos
113 113
114 #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