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

webkit/fileapi/file_system_origin_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 "testing/gtest/include/gtest/gtest.h"
 
 #include <string>
 
 #include "base/file_util.h"
-#include "base/memory/scoped_temp_dir.h"
+#include "base/scoped_temp_dir.h"
 #include "webkit/fileapi/file_system_origin_database.h"
 
 namespace fileapi {
 
 TEST(FileSystemOriginDatabaseTest, BasicTest) {
   ScopedTempDir dir;
   ASSERT_TRUE(dir.CreateUniqueTempDir());
   const FilePath kDBFile = dir.path().AppendASCII("fsod.db");
   EXPECT_FALSE(file_util::PathExists(kDBFile));
 
@@ skipping 136 matching lines @@
     EXPECT_EQ(origins[1].second, path1);
   } else {
     EXPECT_EQ(origins[0].first, origin1);
     EXPECT_EQ(origins[0].second, path1);
     EXPECT_EQ(origins[1].first, origin0);
     EXPECT_EQ(origins[1].second, path0);
   }
 }
 
 }  // namespace fileapi