| Index: chrome/browser/extensions/convert_user_script.cc
|
| diff --git a/chrome/browser/extensions/convert_user_script.cc b/chrome/browser/extensions/convert_user_script.cc
|
| index 007aff39710f824eccd7eca18de6c1b9344c2e39..5f85f5c970e3aa8e03a0b8157e042d42da397cc0 100644
|
| --- a/chrome/browser/extensions/convert_user_script.cc
|
| +++ b/chrome/browser/extensions/convert_user_script.cc
|
| @@ -10,16 +10,16 @@
|
| #include "base/base64.h"
|
| #include "base/file_path.h"
|
| #include "base/file_util.h"
|
| +#include "base/files/scoped_temp_dir.h"
|
| #include "base/json/json_file_value_serializer.h"
|
| #include "base/path_service.h"
|
| -#include "base/scoped_temp_dir.h"
|
| #include "base/string_util.h"
|
| #include "base/utf_string_conversions.h"
|
| #include "chrome/browser/extensions/user_script_master.h"
|
| #include "chrome/common/chrome_paths.h"
|
| #include "chrome/common/extensions/extension.h"
|
| -#include "chrome/common/extensions/extension_manifest_constants.h"
|
| #include "chrome/common/extensions/extension_file_util.h"
|
| +#include "chrome/common/extensions/extension_manifest_constants.h"
|
| #include "chrome/common/extensions/user_script.h"
|
| #include "crypto/sha2.h"
|
| #include "googleurl/src/gurl.h"
|
| @@ -57,7 +57,7 @@ scoped_refptr<Extension> ConvertUserScriptToExtension(
|
| return NULL;
|
| }
|
|
|
| - ScopedTempDir temp_dir;
|
| + base::ScopedTempDir temp_dir;
|
| if (!temp_dir.CreateUniqueTempDirUnderPath(install_temp_dir)) {
|
| *error = ASCIIToUTF16("Could not create temporary directory.");
|
| return NULL;
|
|
|