summaryrefslogtreecommitdiffstats
path: root/chrome/browser/process_singleton_browsertest.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/process_singleton_browsertest.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/process_singleton_browsertest.cc')
-rw-r--r--chrome/browser/process_singleton_browsertest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/process_singleton_browsertest.cc b/chrome/browser/process_singleton_browsertest.cc
index 55ac962..c0053fb 100644
--- a/chrome/browser/process_singleton_browsertest.cc
+++ b/chrome/browser/process_singleton_browsertest.cc
@@ -14,18 +14,18 @@
#include "base/command_line.h"
#include "base/file_path.h"
#include "base/file_util.h"
+#include "base/files/scoped_temp_dir.h"
#include "base/memory/ref_counted.h"
#include "base/path_service.h"
#include "base/process_util.h"
-#include "base/scoped_temp_dir.h"
#include "base/synchronization/waitable_event.h"
#include "base/test/test_timeouts.h"
#include "base/threading/thread.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
-#include "chrome/test/base/test_launcher_utils.h"
#include "chrome/test/base/in_process_browser_test.h"
+#include "chrome/test/base/test_launcher_utils.h"
namespace {
@@ -214,7 +214,7 @@ class ProcessSingletonTest : public InProcessBrowserTest {
// We don't want to use the default profile, but can't use UITest's since we
// don't use UITest::LaunchBrowser.
- ScopedTempDir temp_profile_dir_;
+ base::ScopedTempDir temp_profile_dir_;
};
#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS)