| Index: base/file_version_info_unittest.cc
|
| diff --git a/base/file_version_info_unittest.cc b/base/file_version_info_unittest.cc
|
| index 4c0ba6ffe32695de04af31f8801d9b35ca186a85..ac5320f398b2dac51fabf6889ec7558668c79a13 100644
|
| --- a/base/file_version_info_unittest.cc
|
| +++ b/base/file_version_info_unittest.cc
|
| @@ -2,12 +2,14 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include "base/file_version_info.h"
|
| +
|
| #include <stddef.h>
|
|
|
| -#include "base/file_version_info.h"
|
| +#include <memory>
|
| +
|
| #include "base/files/file_path.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/path_service.h"
|
| #include "build/build_config.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| @@ -60,7 +62,7 @@ TEST(FileVersionInfoTest, HardCodedProperties) {
|
| FilePath dll_path = GetTestDataPath();
|
| dll_path = dll_path.Append(kDLLName);
|
|
|
| - scoped_ptr<FileVersionInfo> version_info(
|
| + std::unique_ptr<FileVersionInfo> version_info(
|
| FileVersionInfo::CreateFileVersionInfo(dll_path));
|
|
|
| int j = 0;
|
| @@ -101,7 +103,7 @@ TEST(FileVersionInfoTest, IsOfficialBuild) {
|
| FilePath dll_path = GetTestDataPath();
|
| dll_path = dll_path.Append(kDLLNames[i]);
|
|
|
| - scoped_ptr<FileVersionInfo> version_info(
|
| + std::unique_ptr<FileVersionInfo> version_info(
|
| FileVersionInfo::CreateFileVersionInfo(dll_path));
|
|
|
| EXPECT_EQ(kExpected[i], version_info->is_official_build());
|
| @@ -114,7 +116,7 @@ TEST(FileVersionInfoTest, CustomProperties) {
|
| FilePath dll_path = GetTestDataPath();
|
| dll_path = dll_path.AppendASCII("FileVersionInfoTest1.dll");
|
|
|
| - scoped_ptr<FileVersionInfo> version_info(
|
| + std::unique_ptr<FileVersionInfo> version_info(
|
| FileVersionInfo::CreateFileVersionInfo(dll_path));
|
|
|
| // Test few existing properties.
|
|
|