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

chrome/browser/history/starred_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 <vector>
 
 #include "base/file_util.h"
 #include "base/path_service.h"
+#include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
-#include "base/memory/scoped_temp_dir.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/starred_url_database.h"
 #include "chrome/common/chrome_paths.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace history {
 
 class StarredURLDatabaseTest : public testing::Test,
                                public StarredURLDatabase {
@@ skipping 256 matching lines @@
   DeleteURLRow(entry.url_id);
 
   // Fix up the table.
   ASSERT_TRUE(EnsureStarredIntegrity());
 
   // The entry we just created should have been nuked.
   ASSERT_EQ(initial_count, GetStarredEntryCount());
 }
 
 }  // namespace history