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

chrome/browser/user_style_sheet_watcher_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/user_style_sheet_watcher.h"
 
+#include "base/base64.h"
 #include "base/basictypes.h"
-#include "base/base64.h"
 #include "base/file_util.h"
-#include "base/memory/scoped_temp_dir.h"
 #include "base/message_loop.h"
+#include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "content/browser/browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(UserStyleSheetWatcherTest, StyleLoad) {
   ScopedTempDir dir;
   ASSERT_TRUE(dir.CreateUniqueTempDir());
 
   std::string css_file_contents = "a { color: green; }";
@@ skipping 23 matching lines @@
 
   GURL result_url = style_sheet_watcher->user_style_sheet();
   std::string result = result_url.spec();
   std::string prefix = "data:text/css;charset=utf-8;base64,";
   ASSERT_TRUE(StartsWithASCII(result, prefix, true));
   result = result.substr(prefix.length());
   std::string decoded;
   ASSERT_TRUE(base::Base64Decode(result, &decoded));
   ASSERT_EQ(css_file_contents, decoded);
 }