diff options
64 files changed, 28 insertions, 94 deletions
diff --git a/app/resource_bundle_dummy.cc b/app/resource_bundle_dummy.cc index 53a1435..9a22afd 100644 --- a/app/resource_bundle_dummy.cc +++ b/app/resource_bundle_dummy.cc @@ -8,7 +8,6 @@ #include "base/lock.h" #include "base/logging.h" -#include "base/win_util.h" #include "gfx/font.h" ResourceBundle* ResourceBundle::g_shared_instance_ = NULL; diff --git a/app/win_util.cc b/app/win_util.cc index 46a4f92..e760a24 100644 --- a/app/win_util.cc +++ b/app/win_util.cc @@ -19,7 +19,6 @@ #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/native_library.h" -#include "base/registry.h" #include "base/scoped_comptr_win.h" #include "base/scoped_handle.h" #include "base/scoped_handle_win.h" diff --git a/base/crypto/symmetric_key_mac.cc b/base/crypto/symmetric_key_mac.cc index 778a5dc..574f9d2 100644 --- a/base/crypto/symmetric_key_mac.cc +++ b/base/crypto/symmetric_key_mac.cc @@ -10,7 +10,6 @@ #include "base/crypto/cssm_init.h" #include "base/logging.h" -#include "base/rand_util.h" namespace { diff --git a/base/file_path.cc b/base/file_path.cc index 24a798e..e330e3c 100644 --- a/base/file_path.cc +++ b/base/file_path.cc @@ -4,7 +4,9 @@ #include "base/file_path.h" -#if defined(OS_MACOSX) +#if defined(OS_WIN) +#include <windows.h> +#elif defined(OS_MACOSX) #include <CoreServices/CoreServices.h> #endif @@ -22,9 +24,6 @@ #include "base/scoped_cftyperef.h" #include "base/third_party/icu/icu_utf.h" #endif -#if defined(OS_WIN) -#include "base/win_util.h" -#endif #if defined(FILE_PATH_USES_WIN_SEPARATORS) const FilePath::CharType FilePath::kSeparators[] = FILE_PATH_LITERAL("\\/"); diff --git a/base/message_pump_win.cc b/base/message_pump_win.cc index 6fa3e7d..fc4b2e4 100644 --- a/base/message_pump_win.cc +++ b/base/message_pump_win.cc @@ -7,7 +7,6 @@ #include <math.h> #include "base/histogram.h" -#include "base/win_util.h" using base::Time; diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc index 3455a43..d427cea 100644 --- a/base/process_util_posix.cc +++ b/base/process_util_posix.cc @@ -24,7 +24,6 @@ #include "base/logging.h" #include "base/platform_thread.h" #include "base/process_util.h" -#include "base/rand_util.h" #include "base/scoped_ptr.h" #include "base/string_util.h" #include "base/time.h" @@ -34,6 +33,7 @@ #include <crt_externs.h> #define environ (*_NSGetEnviron()) #include "base/mach_ipc_mac.h" +#include "base/rand_util.h" #else extern char** environ; #endif diff --git a/base/shared_memory_win.cc b/base/shared_memory_win.cc index 7d3e4cd..7974e14 100644 --- a/base/shared_memory_win.cc +++ b/base/shared_memory_win.cc @@ -5,7 +5,6 @@ #include "base/shared_memory.h" #include "base/logging.h" -#include "base/win_util.h" namespace base { diff --git a/base/trace_event_win.cc b/base/trace_event_win.cc index eae6782..12673e9 100644 --- a/base/trace_event_win.cc +++ b/base/trace_event_win.cc @@ -4,7 +4,7 @@ #include "base/trace_event_win.h" #include "base/atomicops.h" -#include "base/logging_win.h" +#include "base/logging.h" #include "base/singleton.h" #include <initguid.h> // NOLINT diff --git a/base/win_util_unittest.cc b/base/win_util_unittest.cc index 39162a5..f20e7d2 100644 --- a/base/win_util_unittest.cc +++ b/base/win_util_unittest.cc @@ -5,7 +5,6 @@ #include <windows.h> #include "testing/gtest/include/gtest/gtest.h" -#include "base/registry.h" #include "base/string_util.h" #include "base/win_util.h" diff --git a/chrome/app/breakpad_linux.cc b/chrome/app/breakpad_linux.cc index 59dedb9..28b69ba 100644 --- a/chrome/app/breakpad_linux.cc +++ b/chrome/app/breakpad_linux.cc @@ -21,7 +21,6 @@ #include "base/file_path.h" #include "base/global_descriptors_posix.h" #include "base/path_service.h" -#include "base/rand_util.h" #include "base/string_util.h" #include "breakpad/src/client/linux/handler/exception_handler.h" #include "breakpad/src/client/linux/minidump_writer/directory_reader.h" diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc index fd10a9d..506a50c 100644 --- a/chrome/app/chrome_dll_main.cc +++ b/chrome/app/chrome_dll_main.cc @@ -91,7 +91,6 @@ #endif #if defined(OS_WIN) -#include "base/win_util.h" #include "sandbox/src/sandbox.h" #include "tools/memory_watcher/memory_watcher.h" #endif diff --git a/chrome/browser/browser_accessibility_manager_win.cc b/chrome/browser/browser_accessibility_manager_win.cc index eddb1c3..c1ce8a7 100644 --- a/chrome/browser/browser_accessibility_manager_win.cc +++ b/chrome/browser/browser_accessibility_manager_win.cc @@ -4,7 +4,6 @@ #include "chrome/browser/browser_accessibility_manager_win.h" -#include "base/scoped_comptr_win.h" #include "chrome/browser/browser_accessibility_win.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/renderer_host/render_view_host.h" diff --git a/chrome/browser/browser_accessibility_win.h b/chrome/browser/browser_accessibility_win.h index 7725ea5..eb04c51 100644 --- a/chrome/browser/browser_accessibility_win.h +++ b/chrome/browser/browser_accessibility_win.h @@ -12,7 +12,6 @@ #include <vector> -#include "base/scoped_comptr_win.h" #include "chrome/browser/browser_accessibility_manager_win.h" #include "ia2_api_all.h" // Generated #include "webkit/glue/webaccessibility.h" diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 60fab61..04fd26b 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -111,8 +111,6 @@ #include "app/l10n_util_win.h" #include "app/win_util.h" -#include "base/registry.h" -#include "base/win_util.h" #include "chrome/browser/browser_trial.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/net/url_fixer_upper.h" diff --git a/chrome/browser/chromeos/login/google_authenticator.h b/chrome/browser/chromeos/login/google_authenticator.h index 8b0acb2..155679c 100644 --- a/chrome/browser/chromeos/login/google_authenticator.h +++ b/chrome/browser/chromeos/login/google_authenticator.h @@ -13,7 +13,6 @@ #include "base/file_path.h" #include "base/gtest_prod_util.h" #include "base/ref_counted.h" -#include "base/sha2.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/cryptohome_library.h" #include "chrome/browser/chromeos/login/authenticator.h" diff --git a/chrome/browser/diagnostics/diagnostics_main.cc b/chrome/browser/diagnostics/diagnostics_main.cc index 7ea33d8..bf88222 100644 --- a/chrome/browser/diagnostics/diagnostics_main.cc +++ b/chrome/browser/diagnostics/diagnostics_main.cc @@ -22,10 +22,6 @@ #include "chrome/browser/diagnostics/diagnostics_model.h" #include "chrome/common/chrome_paths.h" -#if defined(OS_WIN) -#include "base/win_util.h" -#endif - namespace { // This is a minimalistic interface to wrap the platform console. This will be // eventually replaced by a view that can be subclassed for each platform and diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc index f2e3a65..28adb8d 100644 --- a/chrome/browser/download/download_manager.cc +++ b/chrome/browser/download/download_manager.cc @@ -46,8 +46,6 @@ #if defined(OS_WIN) #include "app/win_util.h" -#include "base/registry.h" -#include "base/win_util.h" #endif namespace { diff --git a/chrome/browser/extensions/extension_install_ui.cc b/chrome/browser/extensions/extension_install_ui.cc index 298327a..307bcd5 100644 --- a/chrome/browser/extensions/extension_install_ui.cc +++ b/chrome/browser/extensions/extension_install_ui.cc @@ -10,7 +10,6 @@ #include "app/resource_bundle.h" #include "base/command_line.h" #include "base/file_util.h" -#include "base/rand_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/extensions/extension_updater.cc b/chrome/browser/extensions/extension_updater.cc index f0da90f..015002c 100644 --- a/chrome/browser/extensions/extension_updater.cc +++ b/chrome/browser/extensions/extension_updater.cc @@ -35,9 +35,7 @@ #include "net/base/load_flags.h" #include "net/url_request/url_request_status.h" -#if defined(OS_WIN) -#include "base/registry.h" -#elif defined(OS_MACOSX) +#if defined(OS_MACOSX) #include "base/sys_string_conversions.h" #endif diff --git a/chrome/browser/extensions/extension_updater_unittest.cc b/chrome/browser/extensions/extension_updater_unittest.cc index 8f314a9..c9d472e7 100644 --- a/chrome/browser/extensions/extension_updater_unittest.cc +++ b/chrome/browser/extensions/extension_updater_unittest.cc @@ -5,7 +5,6 @@ #include <map> #include "base/file_util.h" -#include "base/rand_util.h" #include "base/scoped_ptr.h" #include "base/stl_util-inl.h" #include "base/string_number_conversions.h" diff --git a/chrome/browser/google_update_settings_posix.cc b/chrome/browser/google_update_settings_posix.cc index d1ce592..7a77e60 100644 --- a/chrome/browser/google_update_settings_posix.cc +++ b/chrome/browser/google_update_settings_posix.cc @@ -8,7 +8,6 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/rand_util.h" #include "base/string_util.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/gtk/extension_install_prompt2_gtk.cc b/chrome/browser/gtk/extension_install_prompt2_gtk.cc index 106a0eb..f22bbfc 100644 --- a/chrome/browser/gtk/extension_install_prompt2_gtk.cc +++ b/chrome/browser/gtk/extension_install_prompt2_gtk.cc @@ -5,7 +5,6 @@ #include <gtk/gtk.h> #include "app/l10n_util.h" -#include "base/rand_util.h" #include "base/string_util.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_window.h" diff --git a/chrome/browser/gtk/extension_install_prompt_gtk.cc b/chrome/browser/gtk/extension_install_prompt_gtk.cc index a0feb83..9fb49b1 100644 --- a/chrome/browser/gtk/extension_install_prompt_gtk.cc +++ b/chrome/browser/gtk/extension_install_prompt_gtk.cc @@ -5,7 +5,6 @@ #include <gtk/gtk.h> #include "app/l10n_util.h" -#include "base/rand_util.h" #include "base/string_util.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_window.h" diff --git a/chrome/browser/icon_loader.cc b/chrome/browser/icon_loader.cc index 19ca22d..2281b89 100644 --- a/chrome/browser/icon_loader.cc +++ b/chrome/browser/icon_loader.cc @@ -5,11 +5,14 @@ #include "chrome/browser/icon_loader.h" #include "base/message_loop.h" -#include "base/mime_util.h" #include "base/thread.h" #include "chrome/browser/browser_process.h" #include "third_party/skia/include/core/SkBitmap.h" +#if defined(TOOLKIT_GTK) +#include "base/mime_util.h" +#endif + IconLoader::IconLoader(const IconGroupID& group, IconSize size, Delegate* delegate) : target_message_loop_(NULL), diff --git a/chrome/browser/metrics/metrics_log.cc b/chrome/browser/metrics/metrics_log.cc index 9b51cfa..176eedf 100644 --- a/chrome/browser/metrics/metrics_log.cc +++ b/chrome/browser/metrics/metrics_log.cc @@ -11,7 +11,6 @@ #include "base/basictypes.h" #include "base/file_util.h" #include "base/file_version_info.h" -#include "base/md5.h" #include "base/perftimer.h" #include "base/scoped_ptr.h" #include "base/string_util.h" diff --git a/chrome/browser/printing/printing_layout_uitest.cc b/chrome/browser/printing/printing_layout_uitest.cc index 4d35c75..1d08d42 100644 --- a/chrome/browser/printing/printing_layout_uitest.cc +++ b/chrome/browser/printing/printing_layout_uitest.cc @@ -6,7 +6,6 @@ #include "base/file_util.h" #include "base/simple_thread.h" #include "base/test/test_file_util.h" -#include "base/win_util.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/tab_proxy.h" diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc index 02ac436..7b3f7d2 100644 --- a/chrome/browser/profile.cc +++ b/chrome/browser/profile.cc @@ -44,7 +44,6 @@ #include "chrome/browser/keychain_mac.h" #include "chrome/browser/password_manager/password_store_mac.h" #elif defined(OS_POSIX) && !defined(OS_CHROMEOS) -#include "base/xdg_util.h" #include "chrome/browser/password_manager/native_backend_gnome_x.h" #include "chrome/browser/password_manager/native_backend_kwallet_x.h" #include "chrome/browser/password_manager/password_store_x.h" @@ -547,4 +546,3 @@ class OffTheRecordProfileImpl : public Profile, Profile *Profile::CreateOffTheRecordProfile() { return new OffTheRecordProfileImpl(this); } - diff --git a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc index 2fd6b30..ab4e3ff 100644 --- a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc +++ b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc @@ -10,7 +10,6 @@ #include "base/basictypes.h" #include "base/format_macros.h" -#include "base/rand_util.h" #include "chrome/browser/sync/engine/syncer_util.h" #include "chrome/browser/sync/engine/update_applicator.h" #include "chrome/browser/sync/sessions/sync_session.h" diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc index dd1bc29..7c2c9da 100644 --- a/chrome/browser/tab_restore_uitest.cc +++ b/chrome/browser/tab_restore_uitest.cc @@ -5,9 +5,6 @@ #include "base/basictypes.h" #include "base/command_line.h" #include "base/file_path.h" -#if defined(OS_WIN) -#include "base/win_util.h" -#endif #include "chrome/app/chrome_dll_resource.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc index 4eba383..8352acd 100644 --- a/chrome/browser/views/about_chrome_view.cc +++ b/chrome/browser/views/about_chrome_view.cc @@ -41,7 +41,6 @@ #if defined(OS_WIN) #include <commdlg.h> -#include "base/registry.h" #include "base/win_util.h" #include "chrome/browser/views/restart_message_box.h" #include "chrome/installer/util/install_util.h" diff --git a/chrome/browser/views/extensions/extension_install_prompt.cc b/chrome/browser/views/extensions/extension_install_prompt.cc index 3a6329f..dd63d35 100644 --- a/chrome/browser/views/extensions/extension_install_prompt.cc +++ b/chrome/browser/views/extensions/extension_install_prompt.cc @@ -4,7 +4,6 @@ #include "app/l10n_util.h" #include "base/file_util.h" -#include "base/rand_util.h" #include "base/string_util.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_window.h" @@ -139,7 +138,8 @@ class InstallDialogContent : public views::View, public views::DialogDelegate { height += kPanelVertMargin; - return gfx::Size(width, std::max(height, icon_size_ + kPanelVertMargin * 2)); + return gfx::Size(width, + std::max(height, icon_size_ + kPanelVertMargin * 2)); } virtual void Layout() { diff --git a/chrome/browser/views/first_run_bubble.cc b/chrome/browser/views/first_run_bubble.cc index 37c2efd..d1db5146 100644 --- a/chrome/browser/views/first_run_bubble.cc +++ b/chrome/browser/views/first_run_bubble.cc @@ -9,7 +9,6 @@ #include "app/resource_bundle.h" #include "app/win_util.h" #include "base/utf_string_conversions.h" -#include "base/win_util.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_window.h" diff --git a/chrome/browser/views/tab_contents/tab_contents_drag_win.cc b/chrome/browser/views/tab_contents/tab_contents_drag_win.cc index c2050e5..6309e17 100644 --- a/chrome/browser/views/tab_contents/tab_contents_drag_win.cc +++ b/chrome/browser/views/tab_contents/tab_contents_drag_win.cc @@ -13,7 +13,6 @@ #include "base/task.h" #include "base/thread.h" #include "base/utf_string_conversions.h" -#include "base/win_util.h" #include "chrome/browser/bookmarks/bookmark_drag_data.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/download/drag_download_file.h" diff --git a/chrome/browser/views/tab_contents/tab_contents_view_win.cc b/chrome/browser/views/tab_contents/tab_contents_view_win.cc index 2150b5c..b4242af 100644 --- a/chrome/browser/views/tab_contents/tab_contents_view_win.cc +++ b/chrome/browser/views/tab_contents/tab_contents_view_win.cc @@ -9,7 +9,6 @@ #include "base/file_path.h" #include "base/keyboard_codes.h" #include "base/time.h" -#include "base/win_util.h" #include "chrome/browser/browser.h" // TODO(beng): this dependency is awful. #include "chrome/browser/browser_process.h" #include "chrome/browser/download/download_request_limiter.h" diff --git a/chrome/common/chrome_paths_win.cc b/chrome/common/chrome_paths_win.cc index 4d7709d..c9fee0f 100644 --- a/chrome/common/chrome_paths_win.cc +++ b/chrome/common/chrome_paths_win.cc @@ -13,7 +13,6 @@ #include "app/win_util.h" #include "base/file_path.h" #include "base/path_service.h" -#include "base/scoped_comptr_win.h" #include "chrome/common/chrome_constants.h" #include "chrome/installer/util/browser_distribution.h" diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc index f18f6f2..7008ca0 100644 --- a/chrome/common/extensions/extension.cc +++ b/chrome/common/extensions/extension.cc @@ -36,10 +36,6 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "webkit/glue/image_decoder.h" -#if defined(OS_WIN) -#include "base/registry.h" -#endif - namespace keys = extension_manifest_keys; namespace values = extension_manifest_values; namespace errors = extension_manifest_errors; diff --git a/chrome/common/sandbox_policy.cc b/chrome/common/sandbox_policy.cc index bef0478..b93f5a2 100644 --- a/chrome/common/sandbox_policy.cc +++ b/chrome/common/sandbox_policy.cc @@ -13,7 +13,6 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/registry.h" #include "base/string_util.h" #include "base/win_util.h" #include "chrome/common/child_process_info.h" diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc index 08e9ae5..c6e8c60 100644 --- a/chrome/installer/setup/setup_main.cc +++ b/chrome/installer/setup/setup_main.cc @@ -14,7 +14,6 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/registry.h" #include "base/scoped_handle_win.h" #include "base/string_number_conversions.h" #include "base/string_util.h" diff --git a/chrome/installer/util/chrome_frame_distribution.cc b/chrome/installer/util/chrome_frame_distribution.cc index d19fc95..423731b 100644 --- a/chrome/installer/util/chrome_frame_distribution.cc +++ b/chrome/installer/util/chrome_frame_distribution.cc @@ -13,7 +13,6 @@ #include <windows.h> #include "base/logging.h" -#include "base/registry.h" #include "base/string_util.h" #include "chrome/installer/util/l10n_string_util.h" #include "chrome/installer/util/google_update_constants.h" diff --git a/chrome/test/selenium/selenium_test.cc b/chrome/test/selenium/selenium_test.cc index 0f688cd..0d6be54 100644 --- a/chrome/test/selenium/selenium_test.cc +++ b/chrome/test/selenium/selenium_test.cc @@ -15,7 +15,6 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/path_service.h" -#include "base/rand_util.h" #include "base/string_util.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/automation/tab_proxy.h" @@ -23,6 +22,10 @@ #include "chrome/test/ui/ui_test.h" #include "net/base/net_util.h" +#ifdef SIMULATE_RUN +#include "base/rand_util.h" +#endif + // Uncomment this to exercise this test without actually running the selenium // test, which can take a while to run. This define is useful when modifying // the analysis code. diff --git a/chrome_frame/bho.cc b/chrome_frame/bho.cc index 436d5cb..62ffa8e 100644 --- a/chrome_frame/bho.cc +++ b/chrome_frame/bho.cc @@ -9,9 +9,7 @@ #include "base/file_path.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/registry.h" #include "base/scoped_bstr_win.h" -#include "base/scoped_variant_win.h" #include "base/string_util.h" #include "chrome_tab.h" // NOLINT #include "chrome_frame/crash_reporting/crash_metrics.h" @@ -385,4 +383,3 @@ void PatchHelper::UnpatchIfNeeded() { state_ = UNKNOWN; } - diff --git a/chrome_frame/bho.h b/chrome_frame/bho.h index bbf6202..bae3385 100644 --- a/chrome_frame/bho.h +++ b/chrome_frame/bho.h @@ -15,7 +15,6 @@ #include <string> -#include "base/scoped_comptr_win.h" #include "chrome_tab.h" // NOLINT #include "chrome_frame/delete_chrome_history.h" #include "chrome_frame/resource.h" @@ -124,4 +123,3 @@ END_SINK_MAP() }; #endif // CHROME_FRAME_BHO_H_ - diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc index bfd8e93..0fac7fc 100644 --- a/chrome_frame/chrome_active_document.cc +++ b/chrome_frame/chrome_active_document.cc @@ -21,7 +21,6 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/registry.h" #include "base/scoped_variant_win.h" #include "base/string_tokenizer.h" #include "base/string_util.h" diff --git a/chrome_frame/chrome_frame_activex.h b/chrome_frame/chrome_frame_activex.h index e55e25e..ca77147 100644 --- a/chrome_frame/chrome_frame_activex.h +++ b/chrome_frame/chrome_frame_activex.h @@ -13,9 +13,6 @@ #include <string> #include <vector> -#include "base/scoped_bstr_win.h" -#include "base/scoped_comptr_win.h" -#include "base/scoped_variant_win.h" #include "chrome_frame/chrome_frame_activex_base.h" #include "chrome_frame/com_type_info_holder.h" #include "grit/chrome_frame_resources.h" diff --git a/chrome_frame/chrome_frame_npapi.cc b/chrome_frame/chrome_frame_npapi.cc index 23638e5..52151a7 100644 --- a/chrome_frame/chrome_frame_npapi.cc +++ b/chrome_frame/chrome_frame_npapi.cc @@ -8,7 +8,6 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/string_util.h" -#include "base/win_util.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome_frame/ff_privilege_check.h" #include "chrome_frame/np_utils.h" diff --git a/chrome_frame/protocol_sink_wrap.cc b/chrome_frame/protocol_sink_wrap.cc index 5752776..7080597 100644 --- a/chrome_frame/protocol_sink_wrap.cc +++ b/chrome_frame/protocol_sink_wrap.cc @@ -8,7 +8,6 @@ #include "chrome_frame/protocol_sink_wrap.h" #include "base/logging.h" -#include "base/registry.h" #include "base/scoped_bstr_win.h" #include "base/singleton.h" #include "base/string_util.h" diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc index 78fccc1..5f59f6c 100644 --- a/chrome_frame/test/chrome_frame_test_utils.cc +++ b/chrome_frame/test/chrome_frame_test_utils.cc @@ -23,7 +23,7 @@ #include "base/registry.h" // to find IE and firefox #include "base/scoped_bstr_win.h" #include "base/scoped_handle.h" -#include "base/scoped_comptr_win.h" +#include "base/scoped_variant_win.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/win_util.h" diff --git a/chrome_frame/test/chrome_frame_test_utils.h b/chrome_frame/test/chrome_frame_test_utils.h index 0df5285..f05a487 100644 --- a/chrome_frame/test/chrome_frame_test_utils.h +++ b/chrome_frame/test/chrome_frame_test_utils.h @@ -19,7 +19,6 @@ #include "base/message_loop.h" #include "base/process_util.h" #include "base/scoped_comptr_win.h" -#include "base/scoped_variant_win.h" #include "chrome_frame/test_utils.h" #include "chrome_frame/test/simulate_input.h" diff --git a/chrome_frame/test/html_util_unittests.cc b/chrome_frame/test/html_util_unittests.cc index f8a0cad..f069898 100644 --- a/chrome_frame/test/html_util_unittests.cc +++ b/chrome_frame/test/html_util_unittests.cc @@ -16,7 +16,6 @@ #include "base/ref_counted.h" #include "base/scoped_handle.h" #include "base/task.h" -#include "base/win_util.h" #include "net/base/net_util.h" #include "chrome_frame/chrome_frame_automation.h" @@ -368,4 +367,3 @@ TEST(HttpUtils, HasFrameBustingHeader) { "X-Frame-Options: SAMEORIGIN\r\n" "X-Frame-Options: ALLOWall\r\n")); } - diff --git a/chrome_frame/test/ie_event_sink.cc b/chrome_frame/test/ie_event_sink.cc index fac3dc5..23d55f1 100644 --- a/chrome_frame/test/ie_event_sink.cc +++ b/chrome_frame/test/ie_event_sink.cc @@ -6,9 +6,9 @@ #include "base/scoped_bstr_win.h" #include "base/scoped_handle.h" +#include "base/scoped_variant_win.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "base/win_util.h" #include "chrome_frame/test/chrome_frame_test_utils.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome_frame/test/navigation_test.cc b/chrome_frame/test/navigation_test.cc index 52f0aac..ebf60b0 100644 --- a/chrome_frame/test/navigation_test.cc +++ b/chrome_frame/test/navigation_test.cc @@ -5,7 +5,6 @@ #include <string> #include "base/scoped_comptr_win.h" -#include "base/win_util.h" #include "chrome_frame/test/chrome_frame_test_utils.h" #include "chrome_frame/test/mock_ie_event_sink_actions.h" #include "chrome_frame/test/mock_ie_event_sink_test.h" @@ -706,4 +705,3 @@ TEST_P(FullTabNavigationTest, CF_UnloadEventTest) { } } // namespace chrome_frame_test - diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index 57b829e..8a182bd 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -15,9 +15,7 @@ #include "base/file_version_info.h" #include "base/i18n/icu_util.h" #include "base/path_service.h" -#include "base/scoped_bstr_win.h" #include "base/scoped_comptr_win.h" -#include "base/scoped_variant_win.h" #include "chrome/browser/automation/automation_provider_list.h" #include "chrome/browser/browser_prefs.h" diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc index f784bcf..2e44e04 100644 --- a/chrome_frame/test/reliability/page_load_test.cc +++ b/chrome_frame/test/reliability/page_load_test.cc @@ -31,7 +31,6 @@ #include "base/keyboard_codes.h" #include "base/i18n/time_formatting.h" #include "base/path_service.h" -#include "base/registry.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/test/test_file_util.h" @@ -628,4 +627,3 @@ void SetPageRange(const CommandLine& parsed_command_line) { } } } - diff --git a/chrome_frame/test/test_server.cc b/chrome_frame/test/test_server.cc index 623a044..2a535d1 100644 --- a/chrome_frame/test/test_server.cc +++ b/chrome_frame/test/test_server.cc @@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <windows.h> +#include <objbase.h> +#include <urlmon.h> + #include "base/logging.h" -#include "base/registry.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" diff --git a/chrome_frame/test/ui_test.cc b/chrome_frame/test/ui_test.cc index 411e07c..143df63 100644 --- a/chrome_frame/test/ui_test.cc +++ b/chrome_frame/test/ui_test.cc @@ -5,6 +5,7 @@ #include <mshtmcid.h> #include <string> +#include "base/scoped_variant_win.h" #include "chrome/common/url_constants.h" #include "chrome_frame/test/chrome_frame_test_utils.h" #include "chrome_frame/test/mock_ie_event_sink_actions.h" @@ -539,4 +540,3 @@ TEST_F(ContextMenuTest, DISABLED_BackForwardWithSwitch) { } } // namespace chrome_frame_test - diff --git a/chrome_frame/urlmon_moniker.h b/chrome_frame/urlmon_moniker.h index 1f168a8..9c456b4 100644 --- a/chrome_frame/urlmon_moniker.h +++ b/chrome_frame/urlmon_moniker.h @@ -12,7 +12,6 @@ #include "base/lazy_instance.h" #include "base/logging.h" -#include "base/scoped_comptr_win.h" #include "base/thread_local.h" #include "googleurl/src/gurl.h" #include "chrome_frame/utils.h" diff --git a/chrome_frame/urlmon_url_request.h b/chrome_frame/urlmon_url_request.h index f17af4c..7fc14b6 100644 --- a/chrome_frame/urlmon_url_request.h +++ b/chrome_frame/urlmon_url_request.h @@ -12,7 +12,6 @@ #include <string> #include "base/lock.h" -#include "base/scoped_comptr_win.h" #include "base/thread.h" #include "base/waitable_event.h" #include "chrome_frame/plugin_url_request.h" @@ -129,4 +128,3 @@ class UrlmonUrlRequestManager }; #endif // CHROME_FRAME_URLMON_URL_REQUEST_H_ - diff --git a/media/tools/mfdecoder/main.cc b/media/tools/mfdecoder/main.cc index 72c4785..c531481 100644 --- a/media/tools/mfdecoder/main.cc +++ b/media/tools/mfdecoder/main.cc @@ -1,6 +1,6 @@ -// Copyright (c) 2010 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. +// Copyright (c) 2010 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. #ifdef UNICODE #undef UNICODE @@ -17,7 +17,6 @@ #include "base/basictypes.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/message_pump_win.h" #include "base/scoped_comptr_win.h" #include "base/scoped_ptr.h" #include "base/time.h" diff --git a/net/disk_cache/backend_impl.cc b/net/disk_cache/backend_impl.cc index 619b5ed..a5110c3 100644 --- a/net/disk_cache/backend_impl.cc +++ b/net/disk_cache/backend_impl.cc @@ -9,7 +9,6 @@ #include "base/file_util.h" #include "base/histogram.h" #include "base/message_loop.h" -#include "base/rand_util.h" #include "base/string_util.h" #include "base/sys_info.h" #include "base/timer.h" diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc index 1df0afa..44bbf68 100644 --- a/net/spdy/spdy_session.cc +++ b/net/spdy/spdy_session.cc @@ -8,7 +8,6 @@ #include "base/linked_ptr.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/rand_util.h" #include "base/stats_counters.h" #include "base/stl_util-inl.h" #include "base/string_number_conversions.h" diff --git a/sandbox/src/dep.cc b/sandbox/src/dep.cc index bf07722..4995601 100644 --- a/sandbox/src/dep.cc +++ b/sandbox/src/dep.cc @@ -4,8 +4,9 @@ #include "sandbox/src/dep.h" +#include <windows.h> + #include "base/logging.h" -#include "base/win_util.h" namespace sandbox { diff --git a/sandbox/src/process_thread_dispatcher.cc b/sandbox/src/process_thread_dispatcher.cc index f3badb4..cc137a5 100644 --- a/sandbox/src/process_thread_dispatcher.cc +++ b/sandbox/src/process_thread_dispatcher.cc @@ -6,7 +6,6 @@ #include "base/basictypes.h" #include "base/logging.h" -#include "base/win_util.h" #include "sandbox/src/crosscall_client.h" #include "sandbox/src/interception.h" #include "sandbox/src/interceptors.h" diff --git a/sandbox/src/registry_policy.cc b/sandbox/src/registry_policy.cc index 2943033..497636f 100644 --- a/sandbox/src/registry_policy.cc +++ b/sandbox/src/registry_policy.cc @@ -7,7 +7,6 @@ #include "sandbox/src/registry_policy.h" #include "base/logging.h" -#include "base/scoped_handle_win.h" #include "sandbox/src/ipc_tags.h" #include "sandbox/src/policy_engine_opcodes.h" #include "sandbox/src/policy_params.h" diff --git a/views/controls/listbox/native_listbox_win.cc b/views/controls/listbox/native_listbox_win.cc index ef8ee2f..5ec5542 100644 --- a/views/controls/listbox/native_listbox_win.cc +++ b/views/controls/listbox/native_listbox_win.cc @@ -11,7 +11,6 @@ #include "app/resource_bundle.h" #include "base/logging.h" #include "base/utf_string_conversions.h" -#include "base/win_util.h" #include "gfx/font.h" #include "views/controls/listbox/listbox.h" #include "views/widget/widget.h" |