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

chrome/installer/util/shell_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 <shellapi.h>
 #include <shlobj.h>
 
 #include <fstream>
 
 #include "base/file_util.h"
 #include "base/path_service.h"
-#include "base/memory/scoped_temp_dir.h"
+#include "base/scoped_temp_dir.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/windows_version.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/master_preferences.h"
 #include "chrome/installer/util/shell_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 bool VerifyChromeShortcut(const std::wstring& exe_path,
                           const std::wstring& shortcut,
@@ skipping 229 matching lines @@
                                    system_shortcut_path.value(),
                                    description,
                                    0));
   EXPECT_TRUE(ShellUtil::RemoveChromeDesktopShortcut(dist,
                                                      ShellUtil::CURRENT_USER,
                                                      false));
   EXPECT_TRUE(ShellUtil::RemoveChromeDesktopShortcut(dist,
                                                      ShellUtil::SYSTEM_LEVEL,
                                                      false));
 }