summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/convert_user_script.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-16 20:34:23 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-16 20:34:23 +0000
commitea1a3f60aa4527939af680eda25c7697901f643c (patch)
tree6835e11842b4ff04ec277a5f961cbf1853b95bae /chrome/browser/extensions/convert_user_script.cc
parenta628d191e68c0d1d308e1a20a5a4d7bf7884c4c5 (diff)
downloadchromium_src-ea1a3f60aa4527939af680eda25c7697901f643c.zip
chromium_src-ea1a3f60aa4527939af680eda25c7697901f643c.tar.gz
chromium_src-ea1a3f60aa4527939af680eda25c7697901f643c.tar.bz2
Move scoped_temp_dir from base to base/files
Also add to base namespace. BUG= Review URL: https://codereview.chromium.org/11359217 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168281 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/convert_user_script.cc')
-rw-r--r--chrome/browser/extensions/convert_user_script.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/convert_user_script.cc b/chrome/browser/extensions/convert_user_script.cc
index 007aff3..5f85f5c 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;