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

chrome/installer/setup/setup_util_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 "base/base_paths.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/string_util.h"
 #include "base/threading/platform_thread.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/installer/setup/setup_util.h"
 #include "chrome/installer/util/master_preferences.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 class SetupUtilTest : public testing::Test {
  protected:
@@ skipping 122 matching lines @@
 
 TEST_F(SetupUtilTest, DeleteFileFromTempProcess) {
   FilePath test_file;
   file_util::CreateTemporaryFileInDir(test_dir_.path(), &test_file);
   ASSERT_TRUE(file_util::PathExists(test_file));
   file_util::WriteFile(test_file, "foo", 3);
   EXPECT_TRUE(installer::DeleteFileFromTempProcess(test_file, 0));
   base::PlatformThread::Sleep(200);
   EXPECT_FALSE(file_util::PathExists(test_file));
 }