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

chrome/installer/util/duplicate_tree_detector_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 <fstream>
 
 #include "base/file_util.h"
-#include "base/memory/scoped_temp_dir.h"
+#include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
 #include "chrome/installer/util/duplicate_tree_detector.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 class DuplicateTreeDetectorTest : public testing::Test {
  protected:
   virtual void SetUp() {
     ASSERT_TRUE(temp_source_dir_.CreateUniqueTempDir());
@@ skipping 140 matching lines @@
 
   // This file should be different.
   FilePath other_file(temp_dest_dir_.path());
   other_file = other_file.AppendASCII("F2");
   CreateTextFile(other_file.MaybeAsASCII(), text_content_2_);
 
   EXPECT_TRUE(installer::IsIdenticalFileHierarchy(source_file, dest_file));
   EXPECT_FALSE(installer::IsIdenticalFileHierarchy(source_file, other_file));
 }