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

chrome/browser/download/base_file_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 "base/file_util.h"
-#include "base/memory/scoped_temp_dir.h"
 #include "base/message_loop.h"
+#include "base/scoped_temp_dir.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/download/base_file.h"
 #include "content/browser/browser_thread.h"
 #include "net/base/file_stream.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 const char kTestData1[] = "Let's write some data to the file!\n";
 const char kTestData2[] = "Writing more data.\n";
@@ skipping 203 matching lines @@
   EXPECT_TRUE(base_file_->Rename(new_path));
   EXPECT_FALSE(file_util::PathExists(initial_path));
   EXPECT_TRUE(file_util::PathExists(new_path));
 
   AppendDataToFile(kTestData2);
 
   base_file_->Finish();
 }
 
 }  // namespace