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

webkit/fileapi/file_system_dir_url_request_job_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.
 //
 // NOTE: These tests are run as part of "unit_tests" (in chrome/test/unit)
 // rather than as part of test_shell_tests because they rely on being able
 // to instantiate a MessageLoop of type TYPE_IO.  test_shell_tests uses
 // TYPE_UI, which URLRequest doesn't allow.
 //
 
 #include "webkit/fileapi/file_system_dir_url_request_job.h"
 
 #include "build/build_config.h"
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/format_macros.h"
-#include "base/memory/scoped_temp_dir.h"
 #include "base/message_loop.h"
 #include "base/platform_file.h"
+#include "base/scoped_temp_dir.h"
 #include "base/string_piece.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/http/http_request_headers.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_path_manager.h"
 
@@ skipping 174 matching lines @@
   MessageLoop::current()->PostTask(FROM_HERE, new QuitNowTask);
   MessageLoop::current()->Run();
 
   request_.reset();
   MessageLoop::current()->RunAllPending();
   // If we get here, success! we didn't crash!
 }
 
 }  // namespace (anonymous)
 }  // namespace fileapi