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

chrome/browser/extensions/user_script_master_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 "chrome/browser/extensions/user_script_master.h"
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
+#include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
-#include "base/memory/scoped_temp_dir.h"
 #include "chrome/test/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/notification_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // Test bringing up a master on a specific directory, putting a script
 // in there, etc.
 
 class UserScriptMasterTest : public testing::Test,
@@ skipping 225 matching lines @@
 
   UserScriptList script_list;
   UserScriptMaster::ScriptReloader::LoadScriptsFromDirectory(
       temp_dir_.path(), &script_list);
   ASSERT_EQ(1U, script_list.size());
 
   EXPECT_EQ(content, script_list[0].js_scripts()[0].GetContent().as_string());
   EXPECT_EQ("http://*.mail.google.com/*",
             script_list[0].url_patterns()[0].GetAsString());
 }