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

webkit/fileapi/sandbox_mount_point_provider_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/sandbox_mount_point_provider.h"
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.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 "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/fileapi/file_system_path_manager.h"
 #include "webkit/fileapi/file_system_util.h"
 
 namespace fileapi {
 
 class MockFileSystemPathManager : public FileSystemPathManager {
  public:
   MockFileSystemPathManager(const FilePath& filesystem_path)
@@ skipping 72 matching lines @@
       ASSERT_TRUE(persistent_set.find(current) != persistent_set.end());
       ++persistent_actual_size;
     }
   }
 
   ASSERT_EQ(temporary_size, temporary_actual_size);
   ASSERT_EQ(persistent_size, persistent_actual_size);
 }
 
 }  // namespace fileapi