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 /app | |
| 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 'app')
| -rw-r--r-- | app/sql/connection_unittest.cc | 2 | ||||
| -rw-r--r-- | app/sql/statement_unittest.cc | 2 | ||||
| -rw-r--r-- | app/sql/transaction_unittest.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/sql/connection_unittest.cc b/app/sql/connection_unittest.cc index 880bb81..2c1a5a0 100644 --- a/app/sql/connection_unittest.cc +++ b/app/sql/connection_unittest.cc @@ -5,7 +5,7 @@ #include "app/sql/connection.h" #include "app/sql/statement.h" #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/sqlite/sqlite3.h" diff --git a/app/sql/statement_unittest.cc b/app/sql/statement_unittest.cc index 2cefd18..0085d7c 100644 --- a/app/sql/statement_unittest.cc +++ b/app/sql/statement_unittest.cc @@ -7,7 +7,7 @@ #include "app/sql/connection.h" #include "app/sql/statement.h" #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/sqlite/sqlite3.h" diff --git a/app/sql/transaction_unittest.cc b/app/sql/transaction_unittest.cc index c8e986d..3d42a31 100644 --- a/app/sql/transaction_unittest.cc +++ b/app/sql/transaction_unittest.cc @@ -6,7 +6,7 @@ #include "app/sql/statement.h" #include "app/sql/transaction.h" #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/sqlite/sqlite3.h" |