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

Side by Side Diff: chrome/browser/chromeos/login/test/oobe_base_test.h

Issue 1384383002: Revert of browser test for kAccountsPrefAllowNewUser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/test/oobe_base_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 4
5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_TEST_OOBE_BASE_TEST_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_TEST_OOBE_BASE_TEST_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_TEST_OOBE_BASE_TEST_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_TEST_OOBE_BASE_TEST_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 initialize_fake_merge_session_ = value; 83 initialize_fake_merge_session_ = value;
84 } 84 }
85 85
86 // Returns chrome://oobe WebUI. 86 // Returns chrome://oobe WebUI.
87 content::WebUI* GetLoginUI(); 87 content::WebUI* GetLoginUI();
88 88
89 // Returns login display. 89 // Returns login display.
90 WebUILoginDisplay* GetLoginDisplay(); 90 WebUILoginDisplay* GetLoginDisplay();
91 91
92 void WaitForGaiaPageLoad(); 92 void WaitForGaiaPageLoad();
93 void WaitForGaiaPageReload();
94 void WaitForSigninScreen(); 93 void WaitForSigninScreen();
95 void ExecuteJsInSigninFrame(const std::string& js); 94 void ExecuteJsInSigninFrame(const std::string& js);
96 void SetSignFormField(const std::string& field_id, 95 void SetSignFormField(const std::string& field_id,
97 const std::string& field_value); 96 const std::string& field_value);
98 97
99 scoped_ptr<FakeGaia> fake_gaia_; 98 scoped_ptr<FakeGaia> fake_gaia_;
100 NetworkPortalDetectorTestImpl* network_portal_detector_; 99 NetworkPortalDetectorTestImpl* network_portal_detector_;
101 100
102 // Whether to use background networking. Note this is only effective when it 101 // Whether to use background networking. Note this is only effective when it
103 // is set before SetUpCommandLine is invoked. 102 // is set before SetUpCommandLine is invoked.
104 bool needs_background_networking_; 103 bool needs_background_networking_;
105 104
106 scoped_ptr<content::WindowedNotificationObserver> login_screen_load_observer_; 105 scoped_ptr<content::WindowedNotificationObserver> login_screen_load_observer_;
107 scoped_ptr<extensions::ScopedCurrentChannel> scoped_channel_; 106 scoped_ptr<extensions::ScopedCurrentChannel> scoped_channel_;
108 HTTPSForwarder gaia_https_forwarder_; 107 HTTPSForwarder gaia_https_forwarder_;
109 std::string gaia_frame_parent_; 108 std::string gaia_frame_parent_;
110 bool initialize_fake_merge_session_; 109 bool initialize_fake_merge_session_;
111 test::JSChecker js_checker_; 110 test::JSChecker js_checker_;
112 111
113 DISALLOW_COPY_AND_ASSIGN(OobeBaseTest); 112 DISALLOW_COPY_AND_ASSIGN(OobeBaseTest);
114 }; 113 };
115 114
116 } // namespace chromeos 115 } // namespace chromeos
117 116
118 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_TEST_OOBE_BASE_TEST_H_ 117 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_TEST_OOBE_BASE_TEST_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/test/oobe_base_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698