summaryrefslogtreecommitdiffstats
path: root/chrome/browser/process_singleton_linux_unittest.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_linux_unittest.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_linux_unittest.cc')
-rw-r--r--chrome/browser/process_singleton_linux_unittest.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/process_singleton_linux_unittest.cc b/chrome/browser/process_singleton_linux_unittest.cc
index 84ccc74..3bc0066 100644
--- a/chrome/browser/process_singleton_linux_unittest.cc
+++ b/chrome/browser/process_singleton_linux_unittest.cc
@@ -4,19 +4,20 @@
#include "chrome/browser/process_singleton.h"
+#include <signal.h>
#include <sys/types.h>
#include <sys/wait.h>
-#include <signal.h>
#include <unistd.h>
-#include <vector>
+
#include <string>
+#include <vector>
#include "base/bind.h"
#include "base/command_line.h"
#include "base/file_path.h"
+#include "base/files/scoped_temp_dir.h"
#include "base/message_loop.h"
#include "base/process_util.h"
-#include "base/scoped_temp_dir.h"
#include "base/stringprintf.h"
#include "base/synchronization/waitable_event.h"
#include "base/test/test_timeouts.h"
@@ -191,7 +192,7 @@ class ProcessSingletonLinuxTest : public testing::Test {
}
content::TestBrowserThread io_thread_;
- ScopedTempDir temp_dir_;
+ base::ScopedTempDir temp_dir_;
base::WaitableEvent wait_event_;
base::WaitableEvent signal_event_;