diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 23:34:17 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 23:34:17 +0000 |
| commit | e078590661444968a2c49a3e5464413714471dca (patch) | |
| tree | 13a4dbe4dedccc8057361bd86c89e065390247fc /webkit/blob | |
| parent | d9f76627b14170b95639619089139b6f0493ae8c (diff) | |
| download | chromium_src-e078590661444968a2c49a3e5464413714471dca.zip chromium_src-e078590661444968a2c49a3e5464413714471dca.tar.gz chromium_src-e078590661444968a2c49a3e5464413714471dca.tar.bz2 | |
Move scoped_temp_dir and scoped_native_library back from base/memory to base.
It looks like they got moved accidentally in http://codereview.chromium.org/6714032
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7048007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86010 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/deletable_file_reference_unittest.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/webkit/blob/blob_url_request_job_unittest.cc b/webkit/blob/blob_url_request_job_unittest.cc index 8fc0af3..5a33a87 100644 --- a/webkit/blob/blob_url_request_job_unittest.cc +++ b/webkit/blob/blob_url_request_job_unittest.cc @@ -9,12 +9,12 @@ #include "base/file_util.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.h" #include "base/message_loop_proxy.h" +#include "base/scoped_temp_dir.h" +#include "base/synchronization/waitable_event.h" #include "base/task.h" #include "base/threading/thread.h" #include "base/time.h" -#include "base/synchronization/waitable_event.h" #include "net/base/file_stream.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" diff --git a/webkit/blob/deletable_file_reference_unittest.cc b/webkit/blob/deletable_file_reference_unittest.cc index 1bd1375..8d764d9 100644 --- a/webkit/blob/deletable_file_reference_unittest.cc +++ b/webkit/blob/deletable_file_reference_unittest.cc @@ -5,9 +5,9 @@ #include "webkit/blob/deletable_file_reference.h" #include "base/file_util.h" -#include "base/memory/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 { |