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

Unified Diff: chrome/browser/chromeos/policy/variations_service_policy_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/policy/variations_service_policy_browsertest.cc
diff --git a/chrome/browser/chromeos/policy/variations_service_policy_browsertest.cc b/chrome/browser/chromeos/policy/variations_service_policy_browsertest.cc
index c2fb0568bc8063ad8c455f9732c56b9ed2531e3f..035f9ad7434e0eb30454fc32d01e11d655e9bea3 100644
--- a/chrome/browser/chromeos/policy/variations_service_policy_browsertest.cc
+++ b/chrome/browser/chromeos/policy/variations_service_policy_browsertest.cc
@@ -2,8 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/string_util.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/policy/device_policy_builder.h"
@@ -46,9 +48,9 @@ IN_PROC_BROWSER_TEST_F(VariationsServiceDevicePolicyTest, VariationsURLValid) {
// g_browser_process->variations_service() is null by default in Chromium
// builds, so construct a VariationsService locally instead.
- scoped_ptr<variations::VariationsService> service =
+ std::unique_ptr<variations::VariationsService> service =
variations::VariationsService::CreateForTesting(
- make_scoped_ptr(new ChromeVariationsServiceClient()),
+ base::WrapUnique(new ChromeVariationsServiceClient()),
g_browser_process->local_state());
// Device policy has updated the cros settings.
« no previous file with comments | « chrome/browser/chromeos/policy/user_policy_test_helper.cc ('k') | chrome/browser/chromeos/policy/wildcard_login_checker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698