Index: chrome/common/chrome_paths_mac.mm |
diff --git a/chrome/common/chrome_paths_mac.mm b/chrome/common/chrome_paths_mac.mm |
index db3262927558e4eaa5ad72c03028e74209935f63..d0bbbf72ff0e356e424dc280eeb1441c990b5770 100644 |
--- a/chrome/common/chrome_paths_mac.mm |
+++ b/chrome/common/chrome_paths_mac.mm |
@@ -2,11 +2,10 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "chrome/common/chrome_paths_internal.h" |
- |
#import <Foundation/Foundation.h> |
#include <string.h> |
+#include <memory> |
#include <string> |
#include "base/base_paths.h" |
@@ -14,10 +13,10 @@ |
#import "base/mac/foundation_util.h" |
#import "base/mac/scoped_nsautorelease_pool.h" |
#include "base/memory/free_deleter.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/path_service.h" |
#include "build/build_config.h" |
#include "chrome/common/chrome_constants.h" |
+#include "chrome/common/chrome_paths_internal.h" |
namespace { |
@@ -230,8 +229,8 @@ NSBundle* OuterAppBundle() { |
bool GetUserDataDirectoryForBrowserBundle(NSBundle* bundle, |
base::FilePath* result) { |
- scoped_ptr<char, base::FreeDeleter> |
- product_dir_name(ProductDirNameForBundle(bundle)); |
+ std::unique_ptr<char, base::FreeDeleter> product_dir_name( |
+ ProductDirNameForBundle(bundle)); |
return GetDefaultUserDataDirectoryForProduct(product_dir_name.get(), result); |
} |