diff options
Diffstat (limited to 'webkit/fileapi')
14 files changed, 24 insertions, 24 deletions
diff --git a/webkit/fileapi/file_system_dir_url_request_job_unittest.cc b/webkit/fileapi/file_system_dir_url_request_job_unittest.cc index 1e4d264..388f7a1 100644 --- a/webkit/fileapi/file_system_dir_url_request_job_unittest.cc +++ b/webkit/fileapi/file_system_dir_url_request_job_unittest.cc @@ -17,9 +17,9 @@ #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" diff --git a/webkit/fileapi/file_system_directory_database_unittest.cc b/webkit/fileapi/file_system_directory_database_unittest.cc index f267ba2..ffecb0f 100644 --- a/webkit/fileapi/file_system_directory_database_unittest.cc +++ b/webkit/fileapi/file_system_directory_database_unittest.cc @@ -6,8 +6,8 @@ #include <math.h> -#include "base/memory/scoped_temp_dir.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" +#include "base/scoped_temp_dir.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/webkit/fileapi/file_system_operation_unittest.cc b/webkit/fileapi/file_system_operation_unittest.cc index 1da94c3..0161362 100644 --- a/webkit/fileapi/file_system_operation_unittest.cc +++ b/webkit/fileapi/file_system_operation_unittest.cc @@ -7,8 +7,8 @@ #include "base/file_util.h" #include "base/logging.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 "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" @@ -17,10 +17,10 @@ #include "webkit/fileapi/file_system_file_util.h" #include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_operation.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/quota_file_util.h" -#include "webkit/fileapi/file_system_test_helper.h" #include "webkit/quota/quota_manager.h" using quota::QuotaManager; diff --git a/webkit/fileapi/file_system_operation_write_unittest.cc b/webkit/fileapi/file_system_operation_write_unittest.cc index b15e032..022fb00 100644 --- a/webkit/fileapi/file_system_operation_write_unittest.cc +++ b/webkit/fileapi/file_system_operation_write_unittest.cc @@ -8,11 +8,11 @@ // TYPE_UI, which URLRequest doesn't allow. // -#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/message_loop.h" +#include "base/message_loop_proxy.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" @@ -26,9 +26,9 @@ #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; diff --git a/webkit/fileapi/file_system_origin_database_unittest.cc b/webkit/fileapi/file_system_origin_database_unittest.cc index c7c4f71..b88be8e7 100644 --- a/webkit/fileapi/file_system_origin_database_unittest.cc +++ b/webkit/fileapi/file_system_origin_database_unittest.cc @@ -7,7 +7,7 @@ #include <string> #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "webkit/fileapi/file_system_origin_database.h" namespace fileapi { diff --git a/webkit/fileapi/file_system_path_manager_unittest.cc b/webkit/fileapi/file_system_path_manager_unittest.cc index 7b07b01..977b657 100644 --- a/webkit/fileapi/file_system_path_manager_unittest.cc +++ b/webkit/fileapi/file_system_path_manager_unittest.cc @@ -12,9 +12,9 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_callback_factory.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" +#include "base/scoped_temp_dir.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" diff --git a/webkit/fileapi/file_system_quota_client_unittest.cc b/webkit/fileapi/file_system_quota_client_unittest.cc index 49927af..80a745f 100644 --- a/webkit/fileapi/file_system_quota_client_unittest.cc +++ b/webkit/fileapi/file_system_quota_client_unittest.cc @@ -5,10 +5,10 @@ #include "base/basictypes.h" #include "base/file_util.h" #include "base/memory/scoped_callback_factory.h" -#include "base/memory/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/platform_file.h" +#include "base/scoped_temp_dir.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/fileapi/file_system_context.h" diff --git a/webkit/fileapi/file_system_url_request_job_unittest.cc b/webkit/fileapi/file_system_url_request_job_unittest.cc index d8627a3..d0e5ae3 100644 --- a/webkit/fileapi/file_system_url_request_job_unittest.cc +++ b/webkit/fileapi/file_system_url_request_job_unittest.cc @@ -17,10 +17,10 @@ #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/message_loop_proxy.h" #include "base/platform_file.h" +#include "base/scoped_temp_dir.h" #include "base/string_piece.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" diff --git a/webkit/fileapi/file_system_usage_cache_unittest.cc b/webkit/fileapi/file_system_usage_cache_unittest.cc index 4188432..fddfedd 100644 --- a/webkit/fileapi/file_system_usage_cache_unittest.cc +++ b/webkit/fileapi/file_system_usage_cache_unittest.cc @@ -6,7 +6,7 @@ #include "base/basictypes.h" #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "testing/gtest/include/gtest/gtest.h" namespace fileapi { diff --git a/webkit/fileapi/file_writer_delegate_unittest.cc b/webkit/fileapi/file_writer_delegate_unittest.cc index ea6a98b..1d07fd8 100644 --- a/webkit/fileapi/file_writer_delegate_unittest.cc +++ b/webkit/fileapi/file_writer_delegate_unittest.cc @@ -12,8 +12,8 @@ #include <vector> #include "base/file_util_proxy.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/base/io_buffer.h" #include "net/url_request/url_request.h" @@ -25,11 +25,11 @@ #include "webkit/fileapi/file_system_operation.h" #include "webkit/fileapi/file_system_operation_context.h" #include "webkit/fileapi/file_system_path_manager.h" +#include "webkit/fileapi/file_system_test_helper.h" #include "webkit/fileapi/file_system_usage_cache.h" #include "webkit/fileapi/file_writer_delegate.h" #include "webkit/fileapi/quota_file_util.h" #include "webkit/fileapi/sandbox_mount_point_provider.h" -#include "webkit/fileapi/file_system_test_helper.h" namespace fileapi { diff --git a/webkit/fileapi/local_file_system_file_util_unittest.cc b/webkit/fileapi/local_file_system_file_util_unittest.cc index 67ba2fe..a446c87 100644 --- a/webkit/fileapi/local_file_system_file_util_unittest.cc +++ b/webkit/fileapi/local_file_system_file_util_unittest.cc @@ -5,21 +5,21 @@ #include <string> #include "base/file_path.h" -#include "base/message_loop_proxy.h" #include "base/memory/scoped_callback_factory.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/message_loop_proxy.h" #include "base/platform_file.h" +#include "base/scoped_temp_dir.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/fileapi/file_system_context.h" #include "webkit/fileapi/file_system_file_util.h" -#include "webkit/fileapi/file_system_types.h" #include "webkit/fileapi/file_system_operation_context.h" #include "webkit/fileapi/file_system_path_manager.h" +#include "webkit/fileapi/file_system_test_helper.h" +#include "webkit/fileapi/file_system_types.h" #include "webkit/fileapi/local_file_system_file_util.h" #include "webkit/fileapi/quota_file_util.h" -#include "webkit/fileapi/file_system_test_helper.h" #include "webkit/quota/quota_manager.h" namespace fileapi { diff --git a/webkit/fileapi/obfuscated_file_system_file_util_unittest.cc b/webkit/fileapi/obfuscated_file_system_file_util_unittest.cc index 3337cca..47db73b 100644 --- a/webkit/fileapi/obfuscated_file_system_file_util_unittest.cc +++ b/webkit/fileapi/obfuscated_file_system_file_util_unittest.cc @@ -8,8 +8,8 @@ #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/platform_file.h" +#include "base/scoped_temp_dir.h" #include "base/sys_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/fileapi/file_system_context.h" diff --git a/webkit/fileapi/quota_file_util_unittest.cc b/webkit/fileapi/quota_file_util_unittest.cc index 8d952ab..7921ae8 100644 --- a/webkit/fileapi/quota_file_util_unittest.cc +++ b/webkit/fileapi/quota_file_util_unittest.cc @@ -6,18 +6,18 @@ #include "base/file_path.h" #include "base/memory/scoped_callback_factory.h" -#include "base/memory/scoped_temp_dir.h" #include "base/message_loop_proxy.h" #include "base/platform_file.h" +#include "base/scoped_temp_dir.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/fileapi/file_system_context.h" #include "webkit/fileapi/file_system_file_util.h" #include "webkit/fileapi/file_system_operation_context.h" #include "webkit/fileapi/file_system_path_manager.h" +#include "webkit/fileapi/file_system_test_helper.h" #include "webkit/fileapi/file_system_types.h" #include "webkit/fileapi/file_system_usage_cache.h" #include "webkit/fileapi/local_file_system_file_util.h" -#include "webkit/fileapi/file_system_test_helper.h" namespace fileapi { diff --git a/webkit/fileapi/sandbox_mount_point_provider_unittest.cc b/webkit/fileapi/sandbox_mount_point_provider_unittest.cc index 6da59d5..6d0b575 100644 --- a/webkit/fileapi/sandbox_mount_point_provider_unittest.cc +++ b/webkit/fileapi/sandbox_mount_point_provider_unittest.cc @@ -12,9 +12,9 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_callback_factory.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" +#include "base/scoped_temp_dir.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/fileapi/file_system_path_manager.h" |