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

Unified Diff: components/proxy_config/pref_proxy_config_tracker_impl_unittest.cc

Issue 1921923002: Convert //components/[o-t]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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: components/proxy_config/pref_proxy_config_tracker_impl_unittest.cc
diff --git a/components/proxy_config/pref_proxy_config_tracker_impl_unittest.cc b/components/proxy_config/pref_proxy_config_tracker_impl_unittest.cc
index f28d61a4bd186c753384676378525cd5fe7caed4..cad3553c1d1f0e3d124b98e573fd29980fecd170 100644
--- a/components/proxy_config/pref_proxy_config_tracker_impl_unittest.cc
+++ b/components/proxy_config/pref_proxy_config_tracker_impl_unittest.cc
@@ -4,6 +4,7 @@
#include "components/proxy_config/pref_proxy_config_tracker_impl.h"
+#include <memory>
#include <string>
#include "base/command_line.h"
@@ -85,7 +86,7 @@ class PrefProxyConfigTrackerImplTest : public testing::Test {
pref_service_.get(), base::ThreadTaskRunnerHandle::Get()));
proxy_config_service_ =
proxy_config_tracker_->CreateTrackingProxyConfigService(
- scoped_ptr<net::ProxyConfigService>(delegate_service_));
+ std::unique_ptr<net::ProxyConfigService>(delegate_service_));
// SetProxyConfigServiceImpl triggers update of initial prefs proxy
// config by tracker to chrome proxy config service, so flush all pending
// tasks so that tests start fresh.
@@ -100,13 +101,13 @@ class PrefProxyConfigTrackerImplTest : public testing::Test {
}
base::MessageLoop loop_;
- scoped_ptr<TestingPrefServiceSimple> pref_service_;
+ std::unique_ptr<TestingPrefServiceSimple> pref_service_;
TestProxyConfigService* delegate_service_; // weak
- scoped_ptr<net::ProxyConfigService> proxy_config_service_;
+ std::unique_ptr<net::ProxyConfigService> proxy_config_service_;
net::ProxyConfig fixed_config_;
private:
- scoped_ptr<PrefProxyConfigTrackerImpl> proxy_config_tracker_;
+ std::unique_ptr<PrefProxyConfigTrackerImpl> proxy_config_tracker_;
};
TEST_F(PrefProxyConfigTrackerImplTest, BaseConfiguration) {
« no previous file with comments | « components/proxy_config/pref_proxy_config_tracker_impl.cc ('k') | components/proxy_config/proxy_config_dictionary.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698