diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 20:34:23 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 20:34:23 +0000 |
| commit | ea1a3f60aa4527939af680eda25c7697901f643c (patch) | |
| tree | 6835e11842b4ff04ec277a5f961cbf1853b95bae /base/path_service_unittest.cc | |
| parent | a628d191e68c0d1d308e1a20a5a4d7bf7884c4c5 (diff) | |
| download | chromium_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 'base/path_service_unittest.cc')
| -rw-r--r-- | base/path_service_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/base/path_service_unittest.cc b/base/path_service_unittest.cc index 5b282c6..0b96c12 100644 --- a/base/path_service_unittest.cc +++ b/base/path_service_unittest.cc @@ -5,13 +5,13 @@ #include "base/path_service.h" #include "base/basictypes.h" -#include "base/file_util.h" #include "base/file_path.h" -#include "base/scoped_temp_dir.h" +#include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/string_util.h" #include "build/build_config.h" -#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest-spi.h" +#include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" #if defined(OS_WIN) @@ -139,7 +139,7 @@ TEST_F(PathServiceTest, Get) { // are supposed to do. TEST_F(PathServiceTest, Override) { int my_special_key = 666; - ScopedTempDir temp_dir; + base::ScopedTempDir temp_dir; ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); FilePath fake_cache_dir(temp_dir.path().AppendASCII("cache")); // PathService::Override should always create the path provided if it doesn't @@ -162,7 +162,7 @@ TEST_F(PathServiceTest, Override) { // Check if multiple overrides can co-exist. TEST_F(PathServiceTest, OverrideMultiple) { int my_special_key = 666; - ScopedTempDir temp_dir; + base::ScopedTempDir temp_dir; ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); FilePath fake_cache_dir1(temp_dir.path().AppendASCII("1")); EXPECT_TRUE(PathService::Override(my_special_key, fake_cache_dir1)); @@ -192,7 +192,7 @@ TEST_F(PathServiceTest, RemoveOverride) { EXPECT_TRUE(PathService::Get(base::DIR_TEMP, &original_user_data_dir)); EXPECT_FALSE(PathService::RemoveOverride(base::DIR_TEMP)); - ScopedTempDir temp_dir; + base::ScopedTempDir temp_dir; ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); EXPECT_TRUE(PathService::Override(base::DIR_TEMP, temp_dir.path())); FilePath new_user_data_dir; |