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

Unified Diff: components/wifi_sync/wifi_credential_syncable_service_factory.cc

Issue 1917673002: Convert //components/[u-z]* 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/wifi_sync/wifi_credential_syncable_service_factory.cc
diff --git a/components/wifi_sync/wifi_credential_syncable_service_factory.cc b/components/wifi_sync/wifi_credential_syncable_service_factory.cc
index 6d1b27c259ec1020098ecac7bb04355a7260428c..6f42289e74f4b216011994d4c9de66bae6b02f3d 100644
--- a/components/wifi_sync/wifi_credential_syncable_service_factory.cc
+++ b/components/wifi_sync/wifi_credential_syncable_service_factory.cc
@@ -7,7 +7,7 @@
#include <string>
#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
#include "build/build_config.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "components/wifi_sync/wifi_config_delegate.h"
@@ -89,14 +89,14 @@ KeyedService* WifiCredentialSyncableServiceFactory::BuildServiceInstanceFor(
}
#if defined(OS_CHROMEOS)
-scoped_ptr<WifiConfigDelegate>
+std::unique_ptr<WifiConfigDelegate>
WifiCredentialSyncableServiceFactory::BuildWifiConfigDelegateChromeOs(
content::BrowserContext* context) const {
// Note: NetworkHandler is a singleton that is managed by
// ChromeBrowserMainPartsChromeos, and destroyed after all
// KeyedService instances are destroyed.
chromeos::NetworkHandler* network_handler = chromeos::NetworkHandler::Get();
- return make_scoped_ptr(new WifiConfigDelegateChromeOs(
+ return base::WrapUnique(new WifiConfigDelegateChromeOs(
GetUserHash(context, !ignore_login_state_for_test_),
network_handler->managed_network_configuration_handler()));
}

Powered by Google App Engine
This is Rietveld 408576698