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

webkit/quota/quota_manager_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/memory/scoped_callback_factory.h"
 #include "base/memory/scoped_ptr.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 "base/stl_util-inl.h"
 #include "base/sys_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageQuotaError.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageQuotaType.h"
 #include "webkit/quota/mock_storage_client.h"
 #include "webkit/quota/quota_database.h"
 #include "webkit/quota/quota_manager.h"
 
 using base::MessageLoopProxy;
@@ skipping 862 matching lines @@
   GetCachedOrigins(kStorageTypeTemporary, &origins);
   EXPECT_EQ(3U, origins.size());
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kData); ++i) {
     if (kData[i].type == kStorageTypeTemporary)
       EXPECT_TRUE(origins.find(GURL(kData[i].origin)) != origins.end());
   }
 }
 
 }  // namespace quota