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

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

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 // Returns login display. 90 // Returns login display.
91 WebUILoginDisplay* GetLoginDisplay(); 91 WebUILoginDisplay* GetLoginDisplay();
92 92
93 void WaitForGaiaPageLoad(); 93 void WaitForGaiaPageLoad();
94 void WaitForGaiaPageReload(); 94 void WaitForGaiaPageReload();
95 void WaitForSigninScreen(); 95 void WaitForSigninScreen();
96 void ExecuteJsInSigninFrame(const std::string& js); 96 void ExecuteJsInSigninFrame(const std::string& js);
97 void SetSignFormField(const std::string& field_id, 97 void SetSignFormField(const std::string& field_id,
98 const std::string& field_value); 98 const std::string& field_value);
99 99
100 scoped_ptr<FakeGaia> fake_gaia_; 100 std::unique_ptr<FakeGaia> fake_gaia_;
101 NetworkPortalDetectorTestImpl* network_portal_detector_; 101 NetworkPortalDetectorTestImpl* network_portal_detector_;
102 102
103 // Whether to use background networking. Note this is only effective when it 103 // Whether to use background networking. Note this is only effective when it
104 // is set before SetUpCommandLine is invoked. 104 // is set before SetUpCommandLine is invoked.
105 bool needs_background_networking_; 105 bool needs_background_networking_;
106 106
107 scoped_ptr<content::WindowedNotificationObserver> login_screen_load_observer_; 107 std::unique_ptr<content::WindowedNotificationObserver>
108 scoped_ptr<extensions::ScopedCurrentChannel> scoped_channel_; 108 login_screen_load_observer_;
109 std::unique_ptr<extensions::ScopedCurrentChannel> scoped_channel_;
109 HTTPSForwarder gaia_https_forwarder_; 110 HTTPSForwarder gaia_https_forwarder_;
110 std::string gaia_frame_parent_; 111 std::string gaia_frame_parent_;
111 bool initialize_fake_merge_session_; 112 bool initialize_fake_merge_session_;
112 test::JSChecker js_checker_; 113 test::JSChecker js_checker_;
113 114
114 DISALLOW_COPY_AND_ASSIGN(OobeBaseTest); 115 DISALLOW_COPY_AND_ASSIGN(OobeBaseTest);
115 }; 116 };
116 117
117 } // namespace chromeos 118 } // namespace chromeos
118 119
119 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_TEST_OOBE_BASE_TEST_H_ 120 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_TEST_OOBE_BASE_TEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698