summaryrefslogtreecommitdiffstats
path: root/remoting
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 /remoting
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 'remoting')
-rw-r--r--remoting/host/host_key_pair_unittest.cc4
-rw-r--r--remoting/host/json_host_config_unittest.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/remoting/host/host_key_pair_unittest.cc b/remoting/host/host_key_pair_unittest.cc
index a90c1ba..f19674f 100644
--- a/remoting/host/host_key_pair_unittest.cc
+++ b/remoting/host/host_key_pair_unittest.cc
@@ -4,10 +4,10 @@
#include <string>
+#include "base/files/scoped_temp_dir.h"
#include "base/memory/ref_counted.h"
#include "base/message_loop.h"
#include "base/message_loop_proxy.h"
-#include "base/scoped_temp_dir.h"
#include "base/string_util.h"
#include "remoting/host/host_key_pair.h"
#include "remoting/host/json_host_config.h"
@@ -38,7 +38,7 @@ class HostKeyPairTest : public testing::Test {
}
MessageLoop message_loop_;
- ScopedTempDir test_dir_;
+ base::ScopedTempDir test_dir_;
scoped_ptr<JsonHostConfig> config_;
};
diff --git a/remoting/host/json_host_config_unittest.cc b/remoting/host/json_host_config_unittest.cc
index dd318ae..4aedf3d 100644
--- a/remoting/host/json_host_config_unittest.cc
+++ b/remoting/host/json_host_config_unittest.cc
@@ -3,9 +3,9 @@
// found in the LICENSE file.
#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/scoped_temp_dir.h"
#include "remoting/host/json_host_config.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -29,7 +29,7 @@ class JsonHostConfigTest : public testing::Test {
}
// The temporary directory used to contain the test operations.
- ScopedTempDir test_dir_;
+ base::ScopedTempDir test_dir_;
};
TEST_F(JsonHostConfigTest, InvalidFile) {