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

Unified Diff: ios/chrome/browser/application_context_impl.h

Issue 1861593005: Convert //ios from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add header 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: ios/chrome/browser/application_context_impl.h
diff --git a/ios/chrome/browser/application_context_impl.h b/ios/chrome/browser/application_context_impl.h
index 02bd11c58c7d91c48147f702179c46ff2e1f4a5a..697b19ee10a06c42e5df6a88f9281845ae76163e 100644
--- a/ios/chrome/browser/application_context_impl.h
+++ b/ios/chrome/browser/application_context_impl.h
@@ -5,11 +5,11 @@
#ifndef IOS_CHROME_BROWSER_APPLICATION_CONTEXT_IMPL_H_
#define IOS_CHROME_BROWSER_APPLICATION_CONTEXT_IMPL_H_
+#include <memory>
#include <string>
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/threading/thread_checker.h"
#include "ios/chrome/browser/application_context.h"
@@ -78,17 +78,17 @@ class ApplicationContextImpl : public ApplicationContext {
void CreateGCMDriver();
base::ThreadChecker thread_checker_;
- scoped_ptr<PrefService> local_state_;
- scoped_ptr<net_log::ChromeNetLog> net_log_;
- scoped_ptr<network_time::NetworkTimeTracker> network_time_tracker_;
- scoped_ptr<IOSChromeIOThread> ios_chrome_io_thread_;
- scoped_ptr<metrics_services_manager::MetricsServicesManager>
+ std::unique_ptr<PrefService> local_state_;
+ std::unique_ptr<net_log::ChromeNetLog> net_log_;
+ std::unique_ptr<network_time::NetworkTimeTracker> network_time_tracker_;
+ std::unique_ptr<IOSChromeIOThread> ios_chrome_io_thread_;
+ std::unique_ptr<metrics_services_manager::MetricsServicesManager>
metrics_services_manager_;
- scoped_ptr<gcm::GCMDriver> gcm_driver_;
- scoped_ptr<component_updater::ComponentUpdateService> component_updater_;
+ std::unique_ptr<gcm::GCMDriver> gcm_driver_;
+ std::unique_ptr<component_updater::ComponentUpdateService> component_updater_;
scoped_refptr<CRLSetFetcher> crl_set_fetcher_;
scoped_refptr<safe_browsing::SafeBrowsingService> safe_browsing_service_;
- scoped_ptr<ios::ChromeBrowserStateManager> chrome_browser_state_manager_;
+ std::unique_ptr<ios::ChromeBrowserStateManager> chrome_browser_state_manager_;
std::string application_locale_;
// Sequenced task runner for local state related I/O tasks.

Powered by Google App Engine
This is Rietveld 408576698