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

chrome/common/extensions/extension_resource_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 <algorithm>
 
 #include "base/file_util.h"
-#include "base/memory/scoped_temp_dir.h"
 #include "base/path_service.h"
+#include "base/scoped_temp_dir.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 
 TEST(ExtensionResourceTest, CreateEmptyResource) {
   ExtensionResource resource;
 
@@ skipping 60 matching lines @@
   // See http://crbug.com/27359.
   expected_path = root_resource;
   ASSERT_TRUE(file_util::AbsolutePath(&expected_path));
 
   EXPECT_EQ(ToLower(expected_path.value()), ToLower(resolved_path.value()));
   EXPECT_EQ(ToLower(temp.path().value()),
             ToLower(resource.extension_root().value()));
   EXPECT_EQ(ToLower(FilePath().AppendASCII(filename).value()),
             ToLower(resource.relative_path().value()));
 }