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

chrome/installer/util/product_unittest.h

 // 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.
 
 #ifndef CHROME_INSTALLER_UTIL_PRODUCT_UNITTEST_H_
 #define CHROME_INSTALLER_UTIL_PRODUCT_UNITTEST_H_
 #pragma once
 
 #include <windows.h>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
-#include "base/memory/scoped_temp_dir.h"
 #include "base/path_service.h"
+#include "base/scoped_temp_dir.h"
 #include "base/win/registry.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class TestWithTempDir : public testing::Test {
  protected:
   virtual void SetUp();
   virtual void TearDown();
 
   ScopedTempDir test_dir_;
 };
@@ skipping 15 matching lines @@
 
   static void DeleteAllTempKeys();
 
  protected:
   HKEY override_;
   base::win::RegKey temp_key_;
   std::wstring temp_name_;
 };
 
 #endif  // CHROME_INSTALLER_UTIL_PRODUCT_UNITTEST_H_