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 /webkit/blob | |
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 'webkit/blob')
-rw-r--r-- | webkit/blob/blob_url_request_job_unittest.cc | 4 | ||||
-rw-r--r-- | webkit/blob/local_file_stream_reader_unittest.cc | 4 | ||||
-rw-r--r-- | webkit/blob/shareable_file_reference_unittest.cc | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/webkit/blob/blob_url_request_job_unittest.cc b/webkit/blob/blob_url_request_job_unittest.cc index 1141714..a9b2241 100644 --- a/webkit/blob/blob_url_request_job_unittest.cc +++ b/webkit/blob/blob_url_request_job_unittest.cc @@ -5,10 +5,10 @@ #include "base/bind.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/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/scoped_temp_dir.h" #include "base/time.h" #include "net/base/io_buffer.h" #include "net/http/http_request_headers.h" @@ -295,7 +295,7 @@ class BlobURLRequestJobTest : public testing::Test { } protected: - ScopedTempDir temp_dir_; + base::ScopedTempDir temp_dir_; FilePath temp_file1_; FilePath temp_file2_; base::Time temp_file_modification_time1_; diff --git a/webkit/blob/local_file_stream_reader_unittest.cc b/webkit/blob/local_file_stream_reader_unittest.cc index 4087037..9c2a228d 100644 --- a/webkit/blob/local_file_stream_reader_unittest.cc +++ b/webkit/blob/local_file_stream_reader_unittest.cc @@ -8,10 +8,10 @@ #include "base/file_path.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/platform_file.h" -#include "base/scoped_temp_dir.h" #include "base/threading/thread.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" @@ -118,7 +118,7 @@ class LocalFileStreamReaderTest : public testing::Test { private: MessageLoop message_loop_; base::Thread file_thread_; - ScopedTempDir dir_; + base::ScopedTempDir dir_; base::Time test_file_modification_time_; }; diff --git a/webkit/blob/shareable_file_reference_unittest.cc b/webkit/blob/shareable_file_reference_unittest.cc index 6234f42..7136fcd 100644 --- a/webkit/blob/shareable_file_reference_unittest.cc +++ b/webkit/blob/shareable_file_reference_unittest.cc @@ -5,9 +5,9 @@ #include "webkit/blob/shareable_file_reference.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" -#include "base/scoped_temp_dir.h" #include "testing/gtest/include/gtest/gtest.h" namespace webkit_blob { @@ -16,7 +16,7 @@ TEST(ShareableFileReferenceTest, TestReferences) { MessageLoop message_loop; scoped_refptr<base::MessageLoopProxy> loop_proxy = base::MessageLoopProxy::current(); - ScopedTempDir temp_dir; + base::ScopedTempDir temp_dir; ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); // Create a file. |