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

chrome/installer/util/delete_tree_work_item_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/base_paths.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/memory/scoped_temp_dir.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
+#include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
 #include "chrome/installer/util/delete_tree_work_item.h"
 #include "chrome/installer/util/work_item.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
   class DeleteTreeWorkItemTest : public testing::Test {
    protected:
     virtual void SetUp() {
       ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
@@ skipping 185 matching lines @@
 
   // verify everything is still there.
   EXPECT_TRUE(file_util::PathExists(key_path));
   EXPECT_TRUE(file_util::PathExists(file_name_delete_1));
   EXPECT_TRUE(file_util::PathExists(file_name_delete_2));
 
   TerminateProcess(pi.hProcess, 0);
   // make sure the handle is closed.
   WaitForSingleObject(pi.hProcess, INFINITE);
 }