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

webkit/fileapi/file_system_operation_write_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 "base/memory/scoped_ptr.h"
+#include "base/message_loop.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/memory/scoped_temp_dir.h"
-#include "base/message_loop.h"
+#include "base/scoped_temp_dir.h"
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_job.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/blob/blob_data.h"
 #include "webkit/blob/blob_storage_controller.h"
 #include "webkit/blob/blob_url_request_job.h"
 #include "webkit/fileapi/file_system_callback_dispatcher.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_operation.h"
 #include "webkit/fileapi/file_system_path_manager.h"
+#include "webkit/fileapi/file_system_test_helper.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/local_file_system_file_util.h"
-#include "webkit/fileapi/file_system_test_helper.h"
 #include "webkit/quota/quota_manager.h"
 
 using quota::QuotaManager;
 
 namespace fileapi {
 
 namespace {
 
 class MockQuotaManager : public QuotaManager {
  public:
@@ skipping 290 matching lines @@
   url_request_context->blob_storage_controller()->UnregisterBlobUrl(blob_url);
 
   EXPECT_EQ(10, bytes_written());
   EXPECT_EQ(base::PLATFORM_FILE_ERROR_NO_SPACE, status());
   EXPECT_TRUE(complete());
 }
 
 // TODO(ericu,dmikurube): Add tests for Cancel.
 
 }  // namespace fileapi