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

webkit/blob/deletable_file_reference_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/blob/deletable_file_reference.h"
 
 #include "base/file_util.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 "testing/gtest/include/gtest/gtest.h"
 
 namespace webkit_blob {
 
 TEST(DeletableFileReferenceTest, TestReferences) {
   scoped_refptr<base::MessageLoopProxy> loop_proxy =
       base::MessageLoopProxy::CreateForCurrentThread();
   ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
@@ skipping 24 matching lines @@
   EXPECT_TRUE(file_util::PathExists(file));
 
   // Drop the second reference, the file and reference should get deleted.
   reference2 = NULL;
   EXPECT_FALSE(DeletableFileReference::Get(file).get());
   MessageLoop::current()->RunAllPending();
   EXPECT_FALSE(file_util::PathExists(file));
 }
 
 }  // namespace webkit_blob