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

chrome/installer/util/create_dir_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 "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.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 "chrome/installer/util/create_dir_work_item.h"
 #include "chrome/installer/util/work_item.h"
-#include "chrome/installer/util/create_dir_work_item.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
   class CreateDirWorkItemTest : public testing::Test {
    protected:
     virtual void SetUp() {
       ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     }
 
     ScopedTempDir temp_dir_;
@@ skipping 99 matching lines @@
 
   RemoveDirectory(dir_to_create_3.value().c_str());
   ASSERT_FALSE(file_util::PathExists(dir_to_create_3));
 
   work_item->Rollback();
 
   // dir_to_create_3 has already been deleted, Rollback should delete
   // the rest.
   EXPECT_FALSE(file_util::PathExists(dir_to_create_1));
 }