summaryrefslogtreecommitdiffstats
path: root/chrome/test/automation
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/test/automation
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/test/automation')
-rw-r--r--chrome/test/automation/proxy_launcher.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/automation/proxy_launcher.h b/chrome/test/automation/proxy_launcher.h
index 763012d..1c6569b 100644
--- a/chrome/test/automation/proxy_launcher.h
+++ b/chrome/test/automation/proxy_launcher.h
@@ -11,9 +11,9 @@
#include "base/callback.h"
#include "base/command_line.h"
#include "base/compiler_specific.h"
+#include "base/files/scoped_temp_dir.h"
#include "base/memory/scoped_ptr.h"
#include "base/process.h"
-#include "base/scoped_temp_dir.h"
#include "base/time.h"
class AutomationProxy;
@@ -160,7 +160,7 @@ class ProxyLauncher {
// We use a temporary directory for profile to avoid issues with being
// unable to delete some files because they're in use, etc.
- ScopedTempDir temp_profile_dir_;
+ base::ScopedTempDir temp_profile_dir_;
// Handle to the first Chrome process.
base::ProcessHandle process_;