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
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 2cefd18f..0085d7cb 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 c8e986df..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"
