Index: chrome/browser/chromeos/login/test/oobe_base_test.h |
diff --git a/chrome/browser/chromeos/login/test/oobe_base_test.h b/chrome/browser/chromeos/login/test/oobe_base_test.h |
index 961a8698455ab6ca68e9cb2221425ef59fcdb6d5..431d040b6af4ef0f3e1aeeaf41400d57454da940 100644 |
--- a/chrome/browser/chromeos/login/test/oobe_base_test.h |
+++ b/chrome/browser/chromeos/login/test/oobe_base_test.h |
@@ -97,15 +97,16 @@ class OobeBaseTest : public ExtensionApiTest { |
void SetSignFormField(const std::string& field_id, |
const std::string& field_value); |
- scoped_ptr<FakeGaia> fake_gaia_; |
+ std::unique_ptr<FakeGaia> fake_gaia_; |
NetworkPortalDetectorTestImpl* network_portal_detector_; |
// Whether to use background networking. Note this is only effective when it |
// is set before SetUpCommandLine is invoked. |
bool needs_background_networking_; |
- scoped_ptr<content::WindowedNotificationObserver> login_screen_load_observer_; |
- scoped_ptr<extensions::ScopedCurrentChannel> scoped_channel_; |
+ std::unique_ptr<content::WindowedNotificationObserver> |
+ login_screen_load_observer_; |
+ std::unique_ptr<extensions::ScopedCurrentChannel> scoped_channel_; |
HTTPSForwarder gaia_https_forwarder_; |
std::string gaia_frame_parent_; |
bool initialize_fake_merge_session_; |