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

Unified Diff: chrome/browser/chromeos/login/screens/update_screen_browsertest.cc

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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
diff --git a/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc b/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
index 69b61535bd769bbdf81e4db4d3547d997d5c0b4a..51bd3a650b1075357717df7b81e81bc518e09843 100644
--- a/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
@@ -2,14 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/browser/chromeos/login/screens/update_screen.h"
+
+#include <memory>
+
#include "base/command_line.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/login/screens/mock_base_screen_delegate.h"
#include "chrome/browser/chromeos/login/screens/mock_error_screen.h"
#include "chrome/browser/chromeos/login/screens/network_error.h"
-#include "chrome/browser/chromeos/login/screens/update_screen.h"
#include "chrome/browser/chromeos/login/startup_utils.h"
#include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
@@ -50,7 +52,7 @@ class UpdateScreenTest : public WizardInProcessBrowserTest {
void SetUpInProcessBrowserTestFixture() override {
fake_update_engine_client_ = new FakeUpdateEngineClient;
chromeos::DBusThreadManager::GetSetterForTesting()->SetUpdateEngineClient(
- scoped_ptr<UpdateEngineClient>(fake_update_engine_client_));
+ std::unique_ptr<UpdateEngineClient>(fake_update_engine_client_));
WizardInProcessBrowserTest::SetUpInProcessBrowserTestFixture();
@@ -117,9 +119,9 @@ class UpdateScreenTest : public WizardInProcessBrowserTest {
}
FakeUpdateEngineClient* fake_update_engine_client_;
- scoped_ptr<MockBaseScreenDelegate> mock_base_screen_delegate_;
- scoped_ptr<MockNetworkErrorView> mock_network_error_view_;
- scoped_ptr<MockErrorScreen> mock_error_screen_;
+ std::unique_ptr<MockBaseScreenDelegate> mock_base_screen_delegate_;
+ std::unique_ptr<MockNetworkErrorView> mock_network_error_view_;
+ std::unique_ptr<MockErrorScreen> mock_error_screen_;
UpdateScreen* update_screen_;
NetworkPortalDetectorTestImpl* network_portal_detector_;
« no previous file with comments | « chrome/browser/chromeos/login/screens/update_screen.h ('k') | chrome/browser/chromeos/login/screens/user_image_screen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698