| Index: chrome/installer/util/master_preferences.h
|
| diff --git a/chrome/installer/util/master_preferences.h b/chrome/installer/util/master_preferences.h
|
| index afaf31924821adb886bda41016ee799a642215c8..424c4dfdec6d2bfedc0ec8a8212b0382c71e3f06 100644
|
| --- a/chrome/installer/util/master_preferences.h
|
| +++ b/chrome/installer/util/master_preferences.h
|
| @@ -8,12 +8,12 @@
|
| #ifndef CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_
|
| #define CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/command_line.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "build/build_config.h"
|
|
|
| namespace base {
|
| @@ -208,7 +208,7 @@ class MasterPreferences {
|
| // copied over to profile preferences.
|
| std::string ExtractPrefString(const std::string& name) const;
|
|
|
| - scoped_ptr<base::DictionaryValue> master_dictionary_;
|
| + std::unique_ptr<base::DictionaryValue> master_dictionary_;
|
| base::DictionaryValue* distribution_;
|
| bool preferences_read_from_file_;
|
| bool chrome_;
|
|
|