Move scoped_temp_dir and scoped_native_library back from base/memory to base.

chrome/browser/history/url_database_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "app/sql/connection.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
-#include "base/memory/scoped_temp_dir.h"
 #include "base/path_service.h"
+#include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/url_database.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
 using base::TimeDelta;
 
 namespace history {
 
@@ skipping 241 matching lines @@
   IconMappingEnumerator e;
   InitIconMappingEnumeratorForEverything(&e);
   IconMapping icon_mapping;
   ASSERT_TRUE(e.GetNextIconMapping(&icon_mapping));
   ASSERT_EQ(url1, icon_mapping.page_url);
   ASSERT_EQ(icon_id, icon_mapping.icon_id);
   ASSERT_FALSE(e.GetNextIconMapping(&icon_mapping));
 }
 
 }  // namespace history