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

chrome/installer/mini_installer/decompress_test.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 "base/file_path.h"
-#include "base/memory/scoped_temp_dir.h"
 #include "base/path_service.h"
+#include "base/scoped_temp_dir.h"
 #include "chrome/installer/mini_installer/decompress.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class MiniDecompressTest : public testing::Test {
  protected:
   virtual void SetUp() {
   }
   virtual void TearDown() {
   }
 };
@@ skipping 15 matching lines @@
 
   // Decompress our test file.
   EXPECT_TRUE(mini_installer::Expand(source_path.value().c_str(),
                                      dest_path.value().c_str()));
 
   // Check if the expanded file is a valid executable.
   DWORD type = static_cast<DWORD>(-1);
   EXPECT_TRUE(GetBinaryType(dest_path.value().c_str(), &type));
   EXPECT_EQ(SCS_32BIT_BINARY, type);
 }