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

chrome/browser/extensions/convert_user_script_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 <string>
 #include <vector>
 
 #include "base/file_path.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 "chrome/browser/extensions/convert_user_script.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(ExtensionFromUserScript, Basic) {
   FilePath test_file;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_file));
   test_file = test_file.AppendASCII("extensions")
                        .AppendASCII("user_script_basic.user.js");
@@ skipping 169 matching lines @@
   EXPECT_EQ("Document Idle Test", extension->name());
   EXPECT_EQ("This script tests document-idle", extension->description());
   EXPECT_EQ("kHnHKec3O/RKKo5/Iu1hKqe4wQERthL0639isNtsfiY=",
             extension->public_key());
 
   // Validate run location.
   ASSERT_EQ(1u, extension->content_scripts().size());
   const UserScript& script = extension->content_scripts()[0];
   EXPECT_EQ(UserScript::DOCUMENT_IDLE, script.run_location());
 }