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

Unified Diff: services/shell/public/cpp/initialize_base_and_icu.cc

Issue 1882423004: Move shell service to toplevel shell namespace (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
« no previous file with comments | « services/shell/public/cpp/identity.h ('k') | services/shell/public/cpp/interface_binder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/shell/public/cpp/initialize_base_and_icu.cc
diff --git a/services/shell/public/cpp/initialize_base_and_icu.cc b/services/shell/public/cpp/initialize_base_and_icu.cc
index 9eb49fa55e5bd79db031a1f5c5dc7aefc0e170b2..4277f4f46f9663cd056d85e0b8937dc02373c2ae 100644
--- a/services/shell/public/cpp/initialize_base_and_icu.cc
+++ b/services/shell/public/cpp/initialize_base_and_icu.cc
@@ -9,9 +9,10 @@
#include <stdint.h>
+#include <memory>
+
#include "base/files/file.h"
#include "base/i18n/icu_util.h"
-#include "base/memory/scoped_ptr.h"
#include "base/rand_util.h"
#include "base/sys_info.h"
#include "mojo/public/c/system/types.h"
@@ -45,7 +46,7 @@ InitializeBase(const uint8_t* icu_data) {
// Olson timezone ID by accessing the zoneinfo files on disk. After
// TimeZone::createDefault is called once here, the timezone ID is
// cached and there's no more need to access the file system.
- scoped_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault());
+ std::unique_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault());
#endif
}
}
« no previous file with comments | « services/shell/public/cpp/identity.h ('k') | services/shell/public/cpp/interface_binder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698