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

webkit/fileapi/file_system_usage_cache_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 "webkit/fileapi/file_system_usage_cache.h"
 
 #include "base/basictypes.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"
 
 namespace fileapi {
 
 class FileSystemUsageCacheTest : public testing::Test {
  public:
   FileSystemUsageCacheTest() {}
 
   void SetUp() {
     ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
@@ skipping 107 matching lines @@
   FilePath usage_file_path = GetUsageFilePath();
   EXPECT_FALSE(FileSystemUsageCache::IncrementDirty(usage_file_path));
 }
 
 TEST_F(FileSystemUsageCacheTest, DecrementDirtyWithoutCacheFileTest) {
   FilePath usage_file_path = GetUsageFilePath();
   EXPECT_FALSE(FileSystemUsageCache::IncrementDirty(usage_file_path));
 }
 
 }  // namespace fileapi