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

chrome/installer/util/self_cleaning_temp_dir_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 <windows.h>
 #include <wincrypt.h>
 
 #include "base/file_util.h"
-#include "base/memory/scoped_temp_dir.h"
+#include "base/scoped_temp_dir.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/installer/util/self_cleaning_temp_dir.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // Returns a string of 8 characters consisting of the letter 'R' followed by
 // seven random hex digits.
 std::wstring GetRandomFilename() {
@@ skipping 108 matching lines @@
               file_util::WriteFile(parent_temp_dir.Append(GetRandomFilename()),
                                    kHiHon, arraysize(kHiHon) - 1));
   }
   EXPECT_FALSE(file_util::DirectoryExists(parent_temp_dir.Append(L"Three")));
   EXPECT_TRUE(file_util::DirectoryExists(parent_temp_dir));
   EXPECT_TRUE(work_dir.Delete());
   EXPECT_FALSE(file_util::DirectoryExists(parent_temp_dir.DirName().DirName()));
 }
 
 }  // namespace installer