diff options
26 files changed, 14 insertions, 32 deletions
diff --git a/chrome_frame/chrome_frame_activex.cc b/chrome_frame/chrome_frame_activex.cc index 7262071..a0a2094 100644 --- a/chrome_frame/chrome_frame_activex.cc +++ b/chrome_frame/chrome_frame_activex.cc @@ -12,7 +12,6 @@ #include "base/basictypes.h" #include "base/command_line.h" #include "base/debug/trace_event.h" -#include "base/file_util.h" #include "base/logging.h" #include "base/memory/singleton.h" #include "base/path_service.h" @@ -76,7 +75,7 @@ class TopLevelWindowMapping { // messages on a top-level window, and passes notification to the appropriate // Chrome-Frame instances. LRESULT CALLBACK TopWindowProc(int code, WPARAM wparam, LPARAM lparam) { - CWPSTRUCT *info = reinterpret_cast<CWPSTRUCT*>(lparam); + CWPSTRUCT* info = reinterpret_cast<CWPSTRUCT*>(lparam); const UINT &message = info->message; const HWND &message_hwnd = info->hwnd; @@ -87,7 +86,7 @@ LRESULT CALLBACK TopWindowProc(int code, WPARAM wparam, LPARAM lparam) { TopLevelWindowMapping::GetInstance()->GetInstances(message_hwnd); TopLevelWindowMapping::WindowList::iterator iter(cf_instances.begin()), end(cf_instances.end()); - for (;iter != end; ++iter) { + for (; iter != end; ++iter) { PostMessage(*iter, WM_HOST_MOVED_NOTIFICATION, NULL, NULL); } break; diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc index 3247343..6f1e7f0 100644 --- a/chrome_frame/chrome_frame_automation.cc +++ b/chrome_frame/chrome_frame_automation.cc @@ -10,7 +10,6 @@ #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/debug/trace_event.h" -#include "base/file_util.h" #include "base/file_version_info.h" #include "base/lazy_instance.h" #include "base/logging.h" diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc index e7865b7..d3aeea9 100644 --- a/chrome_frame/utils.cc +++ b/chrome_frame/utils.cc @@ -10,7 +10,6 @@ #include <mshtml.h> #include <shlobj.h> -#include "base/file_util.h" #include "base/file_version_info.h" #include "base/lazy_instance.h" #include "base/logging.h" diff --git a/courgette/adjustment_method_unittest.cc b/courgette/adjustment_method_unittest.cc index 8f5395b..a511561 100644 --- a/courgette/adjustment_method_unittest.cc +++ b/courgette/adjustment_method_unittest.cc @@ -4,8 +4,6 @@ #include <string> -#include "base/path_service.h" -#include "base/file_util.h" #include "base/string_util.h" #include "courgette/assembly_program.h" diff --git a/courgette/base_test_unittest.cc b/courgette/base_test_unittest.cc index a0e7d05..9565536 100644 --- a/courgette/base_test_unittest.cc +++ b/courgette/base_test_unittest.cc @@ -4,6 +4,7 @@ #include "courgette/base_test_unittest.h" +#include "base/file_util.h" #include "base/path_service.h" void BaseTest::SetUp() { @@ -27,7 +28,6 @@ std::string BaseTest::FileContents(const char* file_name) const { } std::string BaseTest::FilesContents(std::list<std::string> file_names) const { - std::string result; std::list<std::string>::iterator file_name = file_names.begin(); diff --git a/courgette/base_test_unittest.h b/courgette/base_test_unittest.h index e4ea0ec..7dd74a0 100644 --- a/courgette/base_test_unittest.h +++ b/courgette/base_test_unittest.h @@ -8,7 +8,7 @@ #include <list> #include <string> -#include "base/file_util.h" +#include "base/files/file_path.h" #include "testing/gtest/include/gtest/gtest.h" class BaseTest : public testing::Test { diff --git a/courgette/courgette_minimal_tool.cc b/courgette/courgette_minimal_tool.cc index 2fd32c1..972eac4 100644 --- a/courgette/courgette_minimal_tool.cc +++ b/courgette/courgette_minimal_tool.cc @@ -8,8 +8,6 @@ #include <string> -#include "base/file_util.h" - #include "courgette/third_party/bsdiff.h" #include "courgette/courgette.h" #include "courgette/streams.h" diff --git a/courgette/disassembler_win32_x86_unittest.cc b/courgette/disassembler_win32_x86_unittest.cc index c310675..1161327 100644 --- a/courgette/disassembler_win32_x86_unittest.cc +++ b/courgette/disassembler_win32_x86_unittest.cc @@ -4,11 +4,11 @@ #include "courgette/disassembler_win32_x86.h" +#include "base/memory/scoped_ptr.h" #include "courgette/base_test_unittest.h" class DisassemblerWin32X86Test : public BaseTest { public: - void TestExe() const; void TestExe64() const; void TestResourceDll() const; diff --git a/ipc/ipc_channel_nacl.cc b/ipc/ipc_channel_nacl.cc index 5f97c74..805e906 100644 --- a/ipc/ipc_channel_nacl.cc +++ b/ipc/ipc_channel_nacl.cc @@ -13,7 +13,6 @@ #include <algorithm> #include "base/bind.h" -#include "base/file_util.h" #include "base/logging.h" #include "base/message_loop_proxy.h" #include "base/process_util.h" diff --git a/ipc/unix_domain_socket_util_unittest.cc b/ipc/unix_domain_socket_util_unittest.cc index 13a6f8f..3c0469c 100644 --- a/ipc/unix_domain_socket_util_unittest.cc +++ b/ipc/unix_domain_socket_util_unittest.cc @@ -5,9 +5,9 @@ #include <sys/socket.h> #include "base/bind.h" -#include "base/file_util.h" #include "base/files/file_path.h" #include "base/path_service.h" +#include "base/posix/eintr_wrapper.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" diff --git a/media/audio/win/audio_output_win_unittest.cc b/media/audio/win/audio_output_win_unittest.cc index d8d2b4e2..ad20327 100644 --- a/media/audio/win/audio_output_win_unittest.cc +++ b/media/audio/win/audio_output_win_unittest.cc @@ -7,7 +7,6 @@ #include "base/basictypes.h" #include "base/base_paths.h" -#include "base/file_util.h" #include "base/memory/aligned_memory.h" #include "base/path_service.h" #include "base/sync_socket.h" diff --git a/media/filters/blocking_url_protocol_unittest.cc b/media/filters/blocking_url_protocol_unittest.cc index 47b931b..4886ba7 100644 --- a/media/filters/blocking_url_protocol_unittest.cc +++ b/media/filters/blocking_url_protocol_unittest.cc @@ -3,9 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" -#include "base/file_util.h" #include "base/files/file_path.h" -#include "base/path_service.h" #include "base/synchronization/waitable_event.h" #include "media/base/test_data_util.h" #include "media/ffmpeg/ffmpeg_common.h" diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc index 9993bee..62ffffd 100644 --- a/media/filters/ffmpeg_demuxer_unittest.cc +++ b/media/filters/ffmpeg_demuxer_unittest.cc @@ -7,7 +7,6 @@ #include <string> #include "base/bind.h" -#include "base/file_util.h" #include "base/files/file_path.h" #include "base/path_service.h" #include "base/threading/thread.h" diff --git a/net/base/sdch_filter.cc b/net/base/sdch_filter.cc index f5dcc35..6728601 100644 --- a/net/base/sdch_filter.cc +++ b/net/base/sdch_filter.cc @@ -8,7 +8,6 @@ #include <ctype.h> #include <algorithm> -#include "base/file_util.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "net/base/sdch_manager.h" diff --git a/net/base/upload_element.cc b/net/base/upload_element.cc index fd7df78..6b6438a 100644 --- a/net/base/upload_element.cc +++ b/net/base/upload_element.cc @@ -6,8 +6,6 @@ #include <algorithm> -#include "base/file_util.h" -#include "base/threading/thread_restrictions.h" #include "net/base/file_stream.h" #include "net/base/net_errors.h" diff --git a/net/disk_cache/block_files.cc b/net/disk_cache/block_files.cc index f84027e..0e55521 100644 --- a/net/disk_cache/block_files.cc +++ b/net/disk_cache/block_files.cc @@ -5,7 +5,7 @@ #include "net/disk_cache/block_files.h" #include "base/atomicops.h" -#include "base/file_util.h" +#include "base/files/file_path.h" #include "base/metrics/histogram.h" #include "base/string_util.h" #include "base/stringprintf.h" diff --git a/net/disk_cache/cache_creator.cc b/net/disk_cache/cache_creator.cc index e5259af..96e8a1c 100644 --- a/net/disk_cache/cache_creator.cc +++ b/net/disk_cache/cache_creator.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/file_util.h" +#include "base/files/file_path.h" #include "base/metrics/field_trial.h" #include "base/stringprintf.h" #include "net/base/cache_type.h" diff --git a/net/disk_cache/disk_cache_test_util.cc b/net/disk_cache/disk_cache_test_util.cc index ff33ab2..2ea19b6 100644 --- a/net/disk_cache/disk_cache_test_util.cc +++ b/net/disk_cache/disk_cache_test_util.cc @@ -4,8 +4,8 @@ #include "net/disk_cache/disk_cache_test_util.h" +#include "base/files/file_path.h" #include "base/logging.h" -#include "base/file_util.h" #include "base/message_loop_proxy.h" #include "base/path_service.h" #include "net/base/net_errors.h" diff --git a/net/disk_cache/mapped_file_unittest.cc b/net/disk_cache/mapped_file_unittest.cc index 06f8760..53c5402 100644 --- a/net/disk_cache/mapped_file_unittest.cc +++ b/net/disk_cache/mapped_file_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/basictypes.h" -#include "base/file_util.h" +#include "base/files/file_path.h" #include "base/string_util.h" #include "net/disk_cache/disk_cache_test_base.h" #include "net/disk_cache/disk_cache_test_util.h" diff --git a/net/disk_cache/storage_block_unittest.cc b/net/disk_cache/storage_block_unittest.cc index 99232d4..1aca003 100644 --- a/net/disk_cache/storage_block_unittest.cc +++ b/net/disk_cache/storage_block_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/file_util.h" +#include "base/files/file_path.h" #include "net/disk_cache/storage_block.h" #include "net/disk_cache/storage_block-inl.h" #include "net/disk_cache/disk_cache_test_base.h" diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc index 797985b..72cd247 100644 --- a/net/dns/dns_config_service_posix.cc +++ b/net/dns/dns_config_service_posix.cc @@ -8,7 +8,6 @@ #include "base/basictypes.h" #include "base/bind.h" -#include "base/file_util.h" #include "base/files/file_path.h" #include "base/files/file_path_watcher.h" #include "base/memory/scoped_ptr.h" diff --git a/net/test/spawned_test_server/local_test_server_win.cc b/net/test/spawned_test_server/local_test_server_win.cc index b3caad7..656c67b 100644 --- a/net/test/spawned_test_server/local_test_server_win.cc +++ b/net/test/spawned_test_server/local_test_server_win.cc @@ -10,7 +10,7 @@ #include "base/base_paths.h" #include "base/bind.h" #include "base/command_line.h" -#include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/path_service.h" #include "base/process_util.h" diff --git a/net/tools/dump_cache/cache_dumper.cc b/net/tools/dump_cache/cache_dumper.cc index 3c71a92..272851c 100644 --- a/net/tools/dump_cache/cache_dumper.cc +++ b/net/tools/dump_cache/cache_dumper.cc @@ -4,6 +4,7 @@ #include "net/tools/dump_cache/cache_dumper.h" +#include "base/file_util.h" #include "base/utf_string_conversions.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" diff --git a/net/tools/dump_cache/cache_dumper.h b/net/tools/dump_cache/cache_dumper.h index 12569af..4bdf4a1 100644 --- a/net/tools/dump_cache/cache_dumper.h +++ b/net/tools/dump_cache/cache_dumper.h @@ -7,7 +7,6 @@ #include <string> -#include "base/file_util.h" #include "base/files/file_path.h" #include "net/disk_cache/backend_impl.h" diff --git a/net/url_request/url_request_file_dir_job.h b/net/url_request/url_request_file_dir_job.h index 5e5005f..f897493 100644 --- a/net/url_request/url_request_file_dir_job.h +++ b/net/url_request/url_request_file_dir_job.h @@ -7,7 +7,6 @@ #include <string> -#include "base/file_util.h" #include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "net/base/directory_lister.h" @@ -32,7 +31,7 @@ class URLRequestFileDirJob virtual void Kill() OVERRIDE; virtual bool ReadRawData(IOBuffer* buf, int buf_size, - int *bytes_read) OVERRIDE; + int* bytes_read) OVERRIDE; virtual bool GetMimeType(std::string* mime_type) const OVERRIDE; virtual bool GetCharset(std::string* charset) OVERRIDE; diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc index bed2687..d367dc6 100644 --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc @@ -9,7 +9,6 @@ #include "base/bind_helpers.h" #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_util.h" #include "base/file_version_info.h" #include "base/message_loop.h" #include "base/metrics/field_trial.h" |