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

webkit/fileapi/obfuscated_file_system_file_util_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 <set>
 #include <string>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/memory/scoped_temp_dir.h"
 #include "base/platform_file.h"
+#include "base/scoped_temp_dir.h"
 #include "base/sys_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/obfuscated_file_system_file_util.h"
 
 using namespace fileapi;
 
 namespace {
 
@@ skipping 723 matching lines @@
   EXPECT_TRUE(ofsfu()->DirectoryExists(context.get(), src_path));
   context.reset(NewContext());
   EXPECT_TRUE(ofsfu()->DirectoryExists(context.get(), dest_path));
   context.reset(NewContext());
   recursive = true;
   ASSERT_EQ(base::PLATFORM_FILE_OK,
       ofsfu()->Delete(context.get(), dest_path, recursive));
   context.reset(NewContext());
   EXPECT_FALSE(ofsfu()->DirectoryExists(context.get(), dest_path));
 }