diff options
Diffstat (limited to 'chrome')
119 files changed, 161 insertions, 161 deletions
diff --git a/chrome/browser/aeropeek_manager.cc b/chrome/browser/aeropeek_manager.cc index 460e22e..34e6ef6 100644 --- a/chrome/browser/aeropeek_manager.cc +++ b/chrome/browser/aeropeek_manager.cc @@ -9,7 +9,7 @@ #include "app/win/shell.h" #include "base/command_line.h" -#include "base/memory/scoped_native_library.h" +#include "base/scoped_native_library.h" #include "base/synchronization/waitable_event.h" #include "base/win/scoped_comptr.h" #include "base/win/scoped_gdi_object.h" diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc index f203a04..e696aac 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc @@ -5,14 +5,14 @@ #include "testing/gtest/include/gtest/gtest.h" #include "base/file_util.h" +#include "base/i18n/time_formatting.h" #include "base/message_loop.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/string16.h" #include "base/string_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" -#include "base/i18n/time_formatting.h" -#include "base/memory/scoped_temp_dir.h" #include "chrome/browser/bookmarks/bookmark_html_writer.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/importer/firefox2_importer.h" diff --git a/chrome/browser/browser_encoding_uitest.cc b/chrome/browser/browser_encoding_uitest.cc index f2a24f0..5ff82b6 100644 --- a/chrome/browser/browser_encoding_uitest.cc +++ b/chrome/browser/browser_encoding_uitest.cc @@ -4,9 +4,9 @@ #include <string> #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" -#include "chrome/browser/net/url_request_mock_http_job.h" +#include "base/scoped_temp_dir.h" #include "chrome/browser/download/save_package.h" +#include "chrome/browser/net/url_request_mock_http_job.h" #include "chrome/common/pref_names.h" #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/tab_proxy.h" diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc index ad74709..8562252 100644 --- a/chrome/browser/browser_main_win.cc +++ b/chrome/browser/browser_main_win.cc @@ -5,22 +5,21 @@ #include "chrome/browser/browser_main.h" #include "chrome/browser/browser_main_win.h" -#include <shellapi.h> #include <windows.h> +#include <shellapi.h> #include <algorithm> #include "base/command_line.h" #include "base/environment.h" #include "base/i18n/rtl.h" -#include "base/memory/scoped_native_library.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" +#include "base/scoped_native_library.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/win/windows_version.h" #include "base/win/wrapped_window_proc.h" -#include "crypto/nss_util.h" #include "chrome/browser/browser_util_win.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/metrics/metrics_service.h" @@ -36,6 +35,7 @@ #include "chrome/installer/util/shell_util.h" #include "content/common/main_function_params.h" #include "content/common/result_codes.h" +#include "crypto/nss_util.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/base/winsock_init.h" diff --git a/chrome/browser/chromeos/login/owner_key_utils_unittest.cc b/chrome/browser/chromeos/login/owner_key_utils_unittest.cc index 1b5ef26..916b707 100644 --- a/chrome/browser/chromeos/login/owner_key_utils_unittest.cc +++ b/chrome/browser/chromeos/login/owner_key_utils_unittest.cc @@ -10,7 +10,7 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/memory/ref_counted.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "crypto/nss_util.h" #include "crypto/nss_util_internal.h" #include "crypto/rsa_private_key.h" diff --git a/chrome/browser/chromeos/login/owner_manager_unittest.cc b/chrome/browser/chromeos/login/owner_manager_unittest.cc index dd747a6..b60d236 100644 --- a/chrome/browser/chromeos/login/owner_manager_unittest.cc +++ b/chrome/browser/chromeos/login/owner_manager_unittest.cc @@ -10,11 +10,11 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/logging.h" -#include "base/memory/scoped_temp_dir.h" -#include "crypto/nss_util.h" -#include "crypto/rsa_private_key.h" +#include "base/scoped_temp_dir.h" #include "chrome/browser/chromeos/login/mock_owner_key_utils.h" #include "content/browser/browser_thread.h" +#include "crypto/nss_util.h" +#include "crypto/rsa_private_key.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/login/ownership_service_unittest.cc b/chrome/browser/chromeos/login/ownership_service_unittest.cc index 0de7666..f6595cc 100644 --- a/chrome/browser/chromeos/login/ownership_service_unittest.cc +++ b/chrome/browser/chromeos/login/ownership_service_unittest.cc @@ -10,12 +10,12 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.h" -#include "crypto/nss_util.h" -#include "crypto/rsa_private_key.h" +#include "base/scoped_temp_dir.h" #include "chrome/browser/chromeos/login/mock_owner_key_utils.h" #include "chrome/browser/chromeos/login/owner_manager_unittest.h" #include "content/browser/browser_thread.h" +#include "crypto/nss_util.h" +#include "crypto/rsa_private_key.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/login/signed_settings_temp_storage_unittest.cc b/chrome/browser/chromeos/login/signed_settings_temp_storage_unittest.cc index b6273eb..2a8c7ed 100644 --- a/chrome/browser/chromeos/login/signed_settings_temp_storage_unittest.cc +++ b/chrome/browser/chromeos/login/signed_settings_temp_storage_unittest.cc @@ -11,7 +11,7 @@ #include "base/file_util.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/common/logging_chrome.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/login/signed_settings_unittest.cc b/chrome/browser/chromeos/login/signed_settings_unittest.cc index b7c2279..3e01f70 100644 --- a/chrome/browser/chromeos/login/signed_settings_unittest.cc +++ b/chrome/browser/chromeos/login/signed_settings_unittest.cc @@ -6,7 +6,7 @@ #include "base/file_util.h" #include "base/logging.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "base/stringprintf.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/mock_library_loader.h" diff --git a/chrome/browser/download/base_file_unittest.cc b/chrome/browser/download/base_file_unittest.cc index 5f734be..f8da90b 100644 --- a/chrome/browser/download/base_file_unittest.cc +++ b/chrome/browser/download/base_file_unittest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" #include "base/message_loop.h" +#include "base/scoped_temp_dir.h" #include "base/string_number_conversions.h" #include "chrome/browser/download/base_file.h" #include "content/browser/browser_thread.h" diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index 2febbcb..12f46ff 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -5,13 +5,13 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/memory/ref_counted.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/test/test_file_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/download/download_item.h" #include "chrome/browser/download/download_file_manager.h" +#include "chrome/browser/download/download_item.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/download/download_prefs.h" #include "chrome/browser/download/download_shelf.h" diff --git a/chrome/browser/download/download_file_unittest.cc b/chrome/browser/download/download_file_unittest.cc index ab2758e..d982489 100644 --- a/chrome/browser/download/download_file_unittest.cc +++ b/chrome/browser/download/download_file_unittest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" #include "base/message_loop.h" +#include "base/scoped_temp_dir.h" #include "base/string_number_conversions.h" #include "chrome/browser/download/download_file.h" #include "chrome/browser/download/download_manager.h" diff --git a/chrome/browser/download/save_package_unittest.cc b/chrome/browser/download/save_package_unittest.cc index ca108dc..3c8f261 100644 --- a/chrome/browser/download/save_package_unittest.cc +++ b/chrome/browser/download/save_package_unittest.cc @@ -6,7 +6,7 @@ #include "base/file_path.h" #include "base/path_service.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/download/save_package.h" diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc index e6a58d6..c2420ba 100644 --- a/chrome/browser/download/save_page_browsertest.cc +++ b/chrome/browser/download/save_page_browsertest.cc @@ -4,8 +4,8 @@ #include "base/file_path.h" #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/net/url_request_mock_http_job.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/extensions/convert_user_script.cc b/chrome/browser/extensions/convert_user_script.cc index 60eb72c..8d7aafe 100644 --- a/chrome/browser/extensions/convert_user_script.cc +++ b/chrome/browser/extensions/convert_user_script.cc @@ -10,10 +10,9 @@ #include "base/base64.h" #include "base/file_path.h" #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" -#include "crypto/sha2.h" #include "chrome/browser/extensions/user_script_master.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" @@ -21,6 +20,7 @@ #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/extensions/user_script.h" #include "content/common/json_value_serializer.h" +#include "crypto/sha2.h" #include "googleurl/src/gurl.h" namespace keys = extension_manifest_keys; diff --git a/chrome/browser/extensions/convert_user_script_unittest.cc b/chrome/browser/extensions/convert_user_script_unittest.cc index 6949af0..a8aab8f 100644 --- a/chrome/browser/extensions/convert_user_script_unittest.cc +++ b/chrome/browser/extensions/convert_user_script_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/path_service.h" +#include "base/scoped_temp_dir.h" #include "chrome/browser/extensions/convert_user_script.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/convert_web_app.cc b/chrome/browser/extensions/convert_web_app.cc index d47b0fb..bf85919 100644 --- a/chrome/browser/extensions/convert_web_app.cc +++ b/chrome/browser/extensions/convert_web_app.cc @@ -13,18 +13,18 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/logging.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/stringprintf.h" #include "base/time.h" #include "base/utf_string_conversions.h" -#include "crypto/sha2.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/web_apps.h" #include "content/common/json_value_serializer.h" +#include "crypto/sha2.h" #include "googleurl/src/gurl.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/png_codec.h" diff --git a/chrome/browser/extensions/convert_web_app_unittest.cc b/chrome/browser/extensions/convert_web_app_unittest.cc index 918aca9..551a923 100644 --- a/chrome/browser/extensions/convert_web_app_unittest.cc +++ b/chrome/browser/extensions/convert_web_app_unittest.cc @@ -9,8 +9,8 @@ #include "base/file_path.h" #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/stringprintf.h" #include "base/time.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc index e7d0f94..902f070 100644 --- a/chrome/browser/extensions/crx_installer.cc +++ b/chrome/browser/extensions/crx_installer.cc @@ -9,9 +9,9 @@ #include "base/file_util.h" #include "base/lazy_instance.h" -#include "base/memory/scoped_temp_dir.h" #include "base/metrics/histogram.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/stl_util-inl.h" #include "base/stringprintf.h" #include "base/task.h" diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc index 55cb60f..848a863 100644 --- a/chrome/browser/extensions/extension_browsertest.cc +++ b/chrome/browser/extensions/extension_browsertest.cc @@ -10,8 +10,8 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/string_number_conversions.h" -#include "base/memory/scoped_temp_dir.h" #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_creator.h" #include "chrome/browser/extensions/extension_error_reporter.h" diff --git a/chrome/browser/extensions/extension_browsertest.h b/chrome/browser/extensions/extension_browsertest.h index 72ffa0c..93e3627 100644 --- a/chrome/browser/extensions/extension_browsertest.h +++ b/chrome/browser/extensions/extension_browsertest.h @@ -10,7 +10,7 @@ #include "base/command_line.h" #include "base/file_path.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "chrome/test/in_process_browser_test.h" #include "content/common/notification_details.h" #include "content/common/notification_observer.h" diff --git a/chrome/browser/extensions/extension_creator.cc b/chrome/browser/extensions/extension_creator.cc index 2f4acf1..1a90d31 100644 --- a/chrome/browser/extensions/extension_creator.cc +++ b/chrome/browser/extensions/extension_creator.cc @@ -4,19 +4,19 @@ #include "chrome/browser/extensions/extension_creator.h" -#include <vector> #include <string> +#include <vector> #include "base/file_util.h" #include "base/memory/scoped_handle.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" -#include "crypto/rsa_private_key.h" -#include "crypto/signature_creator.h" #include "chrome/browser/extensions/sandboxed_extension_unpacker.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/zip.h" +#include "crypto/rsa_private_key.h" +#include "crypto/signature_creator.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/extension_menu_manager_unittest.cc b/chrome/browser/extensions/extension_menu_manager_unittest.cc index a718ded..cfe2009 100644 --- a/chrome/browser/extensions/extension_menu_manager_unittest.cc +++ b/chrome/browser/extensions/extension_menu_manager_unittest.cc @@ -5,9 +5,9 @@ #include <vector> #include "base/json/json_reader.h" -#include "base/memory/scoped_temp_dir.h" #include "base/memory/scoped_vector.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/extension_event_router.h" diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc index bf7f0a2..6b8e7a9 100644 --- a/chrome/browser/extensions/extension_prefs_unittest.cc +++ b/chrome/browser/extensions/extension_prefs_unittest.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/memory/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/stl_util-inl.h" #include "base/string_number_conversions.h" #include "base/stringprintf.h" @@ -14,10 +14,10 @@ #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension_constants.h" +#include "content/browser/browser_thread.h" #include "content/common/notification_details.h" #include "content/common/notification_observer_mock.h" #include "content/common/notification_source.h" -#include "content/browser/browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" using base::Time; diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index ded4210..e567d05 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -25,8 +25,8 @@ #include "base/version.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/debugger/devtools_manager.h" -#include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/apps_promo.h" +#include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_accessibility_api.h" #include "chrome/browser/extensions/extension_bookmarks_module.h" #include "chrome/browser/extensions/extension_browser_event_router.h" diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h index 61b1b7c..66a32c0 100644 --- a/chrome/browser/extensions/extension_service.h +++ b/chrome/browser/extensions/extension_service.h @@ -11,8 +11,8 @@ #include <string> #include <vector> -#include "base/compiler_specific.h" #include "base/command_line.h" +#include "base/compiler_specific.h" #include "base/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/linked_ptr.h" diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index 67a986f..89256c5 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -13,9 +13,9 @@ #include "base/file_util.h" #include "base/json/json_reader.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/stl_util-inl.h" #include "base/string16.h" #include "base/string_number_conversions.h" diff --git a/chrome/browser/extensions/extension_service_unittest.h b/chrome/browser/extensions/extension_service_unittest.h index 64d31a4..847fda5 100644 --- a/chrome/browser/extensions/extension_service_unittest.h +++ b/chrome/browser/extensions/extension_service_unittest.h @@ -9,8 +9,8 @@ #include "base/file_path.h" #include "base/memory/ref_counted.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 "chrome/browser/extensions/extension_service.h" #include "content/browser/browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/extension_updater.h b/chrome/browser/extensions/extension_updater.h index 2cc7367..9de1391 100644 --- a/chrome/browser/extensions/extension_updater.h +++ b/chrome/browser/extensions/extension_updater.h @@ -15,8 +15,8 @@ #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.h" #include "base/memory/weak_ptr.h" +#include "base/scoped_temp_dir.h" #include "base/task.h" #include "base/time.h" #include "base/timer.h" diff --git a/chrome/browser/extensions/extension_webstore_private_api.cc b/chrome/browser/extensions/extension_webstore_private_api.cc index 7c46cff..dbfdb67 100644 --- a/chrome/browser/extensions/extension_webstore_private_api.cc +++ b/chrome/browser/extensions/extension_webstore_private_api.cc @@ -7,7 +7,7 @@ #include <string> #include <vector> -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "base/values.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/extensions/sandboxed_extension_unpacker.h b/chrome/browser/extensions/sandboxed_extension_unpacker.h index 2857581..7294b39 100644 --- a/chrome/browser/extensions/sandboxed_extension_unpacker.h +++ b/chrome/browser/extensions/sandboxed_extension_unpacker.h @@ -10,7 +10,7 @@ #include "base/file_path.h" #include "base/memory/ref_counted.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "chrome/browser/utility_process_host.h" class DictionaryValue; diff --git a/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc b/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc index 2c6e063..bc31c45 100644 --- a/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc +++ b/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc @@ -4,10 +4,10 @@ #include "base/file_util.h" #include "base/memory/ref_counted.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" -#include "base/memory/scoped_temp_dir.h" #include "chrome/browser/extensions/sandboxed_extension_unpacker.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/test_extension_prefs.h b/chrome/browser/extensions/test_extension_prefs.h index b37f793..e781ee4 100644 --- a/chrome/browser/extensions/test_extension_prefs.h +++ b/chrome/browser/extensions/test_extension_prefs.h @@ -9,7 +9,7 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "chrome/common/extensions/extension.h" class DictionaryValue; diff --git a/chrome/browser/extensions/user_script_master_unittest.cc b/chrome/browser/extensions/user_script_master_unittest.cc index 30ab5e8..84d6a64 100644 --- a/chrome/browser/extensions/user_script_master_unittest.cc +++ b/chrome/browser/extensions/user_script_master_unittest.cc @@ -10,8 +10,8 @@ #include "base/file_util.h" #include "base/message_loop.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" -#include "base/memory/scoped_temp_dir.h" #include "chrome/test/testing_profile.h" #include "content/browser/browser_thread.h" #include "content/common/notification_registrar.h" diff --git a/chrome/browser/history/expire_history_backend_unittest.cc b/chrome/browser/history/expire_history_backend_unittest.cc index 755ad76..dde8c0d 100644 --- a/chrome/browser/history/expire_history_backend_unittest.cc +++ b/chrome/browser/history/expire_history_backend_unittest.cc @@ -10,8 +10,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/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/string16.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" diff --git a/chrome/browser/history/history_querying_unittest.cc b/chrome/browser/history/history_querying_unittest.cc index f29779c..609f78a 100644 --- a/chrome/browser/history/history_querying_unittest.cc +++ b/chrome/browser/history/history_querying_unittest.cc @@ -6,8 +6,8 @@ #include "base/callback.h" #include "base/file_path.h" #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/utf_string_conversions.h" #include "chrome/browser/history/history.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/history/history_unittest.cc b/chrome/browser/history/history_unittest.cc index 67a5869..2d26f1f 100644 --- a/chrome/browser/history/history_unittest.cc +++ b/chrome/browser/history/history_unittest.cc @@ -29,10 +29,10 @@ #include "base/command_line.h" #include "base/file_path.h" #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" #include "base/memory/scoped_vector.h" #include "base/message_loop.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "base/task.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/history/redirect_uitest.cc b/chrome/browser/history/redirect_uitest.cc index edebf94..4b66735 100644 --- a/chrome/browser/history/redirect_uitest.cc +++ b/chrome/browser/history/redirect_uitest.cc @@ -9,9 +9,9 @@ #include "base/file_util.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.h" -#include "base/string_util.h" +#include "base/scoped_temp_dir.h" #include "base/string16.h" +#include "base/string_util.h" #include "base/test/test_timeouts.h" #include "base/threading/platform_thread.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/history/starred_url_database_unittest.cc b/chrome/browser/history/starred_url_database_unittest.cc index 70d0f77..f23df67 100644 --- a/chrome/browser/history/starred_url_database_unittest.cc +++ b/chrome/browser/history/starred_url_database_unittest.cc @@ -6,8 +6,8 @@ #include "base/file_util.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" -#include "base/memory/scoped_temp_dir.h" #include "base/utf_string_conversions.h" #include "chrome/browser/history/history.h" #include "chrome/browser/history/starred_url_database.h" diff --git a/chrome/browser/history/text_database_unittest.cc b/chrome/browser/history/text_database_unittest.cc index 3564c82..15f9a26 100644 --- a/chrome/browser/history/text_database_unittest.cc +++ b/chrome/browser/history/text_database_unittest.cc @@ -6,7 +6,7 @@ #include "base/file_util.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/history/text_database.h" diff --git a/chrome/browser/history/thumbnail_database_unittest.cc b/chrome/browser/history/thumbnail_database_unittest.cc index cbbac7a..5d0b66f 100644 --- a/chrome/browser/history/thumbnail_database_unittest.cc +++ b/chrome/browser/history/thumbnail_database_unittest.cc @@ -10,8 +10,8 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/memory/ref_counted_memory.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "chrome/browser/history/history_database.h" #include "chrome/browser/history/history_unittest_base.h" #include "chrome/browser/history/thumbnail_database.h" diff --git a/chrome/browser/history/top_sites_unittest.cc b/chrome/browser/history/top_sites_unittest.cc index d33c958..ee487c32 100644 --- a/chrome/browser/history/top_sites_unittest.cc +++ b/chrome/browser/history/top_sites_unittest.cc @@ -5,8 +5,8 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/format_macros.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/history/url_database_unittest.cc b/chrome/browser/history/url_database_unittest.cc index 121950d..7197bdb 100644 --- a/chrome/browser/history/url_database_unittest.cc +++ b/chrome/browser/history/url_database_unittest.cc @@ -5,8 +5,8 @@ #include "app/sql/connection.h" #include "base/file_path.h" #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/history/url_database.h" diff --git a/chrome/browser/history/visit_database_unittest.cc b/chrome/browser/history/visit_database_unittest.cc index f5fd80b..eb7e8c9 100644 --- a/chrome/browser/history/visit_database_unittest.cc +++ b/chrome/browser/history/visit_database_unittest.cc @@ -6,8 +6,8 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" -#include "base/memory/scoped_temp_dir.h" #include "chrome/browser/history/url_database.h" #include "chrome/browser/history/visit_database.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/importer/firefox_profile_lock_unittest.cc b/chrome/browser/importer/firefox_profile_lock_unittest.cc index aa6898a..ad0d9cb 100644 --- a/chrome/browser/importer/firefox_profile_lock_unittest.cc +++ b/chrome/browser/importer/firefox_profile_lock_unittest.cc @@ -5,8 +5,8 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/process_util.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" -#include "base/memory/scoped_temp_dir.h" #include "build/build_config.h" #include "chrome/browser/importer/firefox_profile_lock.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/importer/importer_unittest.cc b/chrome/browser/importer/importer_unittest.cc index f0f190a..6764ef6 100644 --- a/chrome/browser/importer/importer_unittest.cc +++ b/chrome/browser/importer/importer_unittest.cc @@ -10,8 +10,8 @@ #include <unknwn.h> #include <intshcut.h> #include <pstore.h> -#include <urlhist.h> #include <shlguid.h> +#include <urlhist.h> #endif #include <vector> @@ -21,10 +21,10 @@ #include "base/file_util.h" #include "base/message_loop.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/stl_util-inl.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "base/memory/scoped_temp_dir.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/importer/importer_bridge.h" #include "chrome/browser/importer/importer_data_types.h" diff --git a/chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc b/chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc index 7e05697..77ab7c4 100644 --- a/chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc +++ b/chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc @@ -4,8 +4,8 @@ #include "base/file_util.h" #include "base/memory/ref_counted.h" -#include "base/memory/scoped_temp_dir.h" #include "base/message_loop.h" +#include "base/scoped_temp_dir.h" #include "base/stl_util-inl.h" #include "base/time.h" #include "chrome/browser/net/sqlite_persistent_cookie_store.h" diff --git a/chrome/browser/parsers/metadata_parser_filebase_unittest.cc b/chrome/browser/parsers/metadata_parser_filebase_unittest.cc index eb5619c..f407b3c 100644 --- a/chrome/browser/parsers/metadata_parser_filebase_unittest.cc +++ b/chrome/browser/parsers/metadata_parser_filebase_unittest.cc @@ -7,7 +7,7 @@ #include "base/file_path.h" #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "base/string_number_conversions.h" #include "base/string_util.h" // TODO(brettw) remove when WideToASCII moves. #include "chrome/browser/parsers/metadata_parser_filebase.h" diff --git a/chrome/browser/password_manager/password_store_default_unittest.cc b/chrome/browser/password_manager/password_store_default_unittest.cc index 1b6bd8d..27bf5f8 100644 --- a/chrome/browser/password_manager/password_store_default_unittest.cc +++ b/chrome/browser/password_manager/password_store_default_unittest.cc @@ -3,16 +3,16 @@ // found in the LICENSE file. #include "base/basictypes.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "base/stl_util-inl.h" #include "base/string_util.h" +#include "base/synchronization/waitable_event.h" #include "base/time.h" #include "base/utf_string_conversions.h" -#include "base/synchronization/waitable_event.h" +#include "chrome/browser/password_manager/password_form_data.h" #include "chrome/browser/password_manager/password_store_change.h" #include "chrome/browser/password_manager/password_store_consumer.h" #include "chrome/browser/password_manager/password_store_default.h" -#include "chrome/browser/password_manager/password_form_data.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/webdata/web_data_service.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/password_manager/password_store_mac_unittest.cc b/chrome/browser/password_manager/password_store_mac_unittest.cc index 44a03d2..2db2294 100644 --- a/chrome/browser/password_manager/password_store_mac_unittest.cc +++ b/chrome/browser/password_manager/password_store_mac_unittest.cc @@ -7,17 +7,17 @@ #include "base/basictypes.h" #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/stl_util-inl.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "content/browser/browser_thread.h" #include "chrome/browser/mock_keychain_mac.h" #include "chrome/browser/password_manager/password_store_consumer.h" #include "chrome/browser/password_manager/password_store_mac.h" #include "chrome/browser/password_manager/password_store_mac_internal.h" #include "chrome/common/chrome_paths.h" +#include "content/browser/browser_thread.h" using webkit_glue::PasswordForm; using testing::_; diff --git a/chrome/browser/password_manager/password_store_win_unittest.cc b/chrome/browser/password_manager/password_store_win_unittest.cc index 310b9e2..5fed181 100644 --- a/chrome/browser/password_manager/password_store_win_unittest.cc +++ b/chrome/browser/password_manager/password_store_win_unittest.cc @@ -3,20 +3,20 @@ // found in the LICENSE file. #include <windows.h> -#include <wincrypt.h> #include <string> #include <vector> +#include <wincrypt.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/stl_util-inl.h" -#include "base/time.h" #include "base/synchronization/waitable_event.h" +#include "base/time.h" +#include "chrome/browser/password_manager/ie7_password.h" #include "chrome/browser/password_manager/password_form_data.h" #include "chrome/browser/password_manager/password_store_consumer.h" #include "chrome/browser/password_manager/password_store_win.h" -#include "chrome/browser/password_manager/ie7_password.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/webdata/web_data_service.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/password_manager/password_store_x_unittest.cc b/chrome/browser/password_manager/password_store_x_unittest.cc index 7e6ed72..74be072 100644 --- a/chrome/browser/password_manager/password_store_x_unittest.cc +++ b/chrome/browser/password_manager/password_store_x_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/basictypes.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "base/stl_util-inl.h" #include "base/string_util.h" #include "base/synchronization/waitable_event.h" diff --git a/chrome/browser/policy/cloud_policy_controller_unittest.cc b/chrome/browser/policy/cloud_policy_controller_unittest.cc index c61b1b2..df2ae58 100644 --- a/chrome/browser/policy/cloud_policy_controller_unittest.cc +++ b/chrome/browser/policy/cloud_policy_controller_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/browser/policy/cloud_policy_controller.h" -#include "base/memory/scoped_temp_dir.h" #include "base/message_loop.h" +#include "base/scoped_temp_dir.h" #include "chrome/browser/policy/device_management_service.h" #include "chrome/browser/policy/device_token_fetcher.h" #include "chrome/browser/policy/mock_configuration_policy_store.h" diff --git a/chrome/browser/policy/config_dir_policy_provider_unittest.cc b/chrome/browser/policy/config_dir_policy_provider_unittest.cc index bc77339..51b8beb 100644 --- a/chrome/browser/policy/config_dir_policy_provider_unittest.cc +++ b/chrome/browser/policy/config_dir_policy_provider_unittest.cc @@ -5,8 +5,8 @@ #include <algorithm> #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/string_number_conversions.h" #include "chrome/browser/policy/config_dir_policy_provider.h" #include "chrome/browser/policy/configuration_policy_pref_store.h" diff --git a/chrome/browser/policy/device_token_fetcher_unittest.cc b/chrome/browser/policy/device_token_fetcher_unittest.cc index c6343e1..9f2301f 100644 --- a/chrome/browser/policy/device_token_fetcher_unittest.cc +++ b/chrome/browser/policy/device_token_fetcher_unittest.cc @@ -5,8 +5,8 @@ #include "chrome/browser/policy/device_token_fetcher.h" #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" #include "base/message_loop.h" +#include "base/scoped_temp_dir.h" #include "chrome/browser/net/gaia/token_service.h" #include "chrome/browser/policy/device_management_service.h" #include "chrome/browser/policy/mock_device_management_backend.h" diff --git a/chrome/browser/policy/user_policy_cache_unittest.cc b/chrome/browser/policy/user_policy_cache_unittest.cc index 5c53e77..7f327ea 100644 --- a/chrome/browser/policy/user_policy_cache_unittest.cc +++ b/chrome/browser/policy/user_policy_cache_unittest.cc @@ -8,8 +8,8 @@ #include <string> #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" #include "base/message_loop.h" +#include "base/scoped_temp_dir.h" #include "base/values.h" #include "chrome/browser/policy/configuration_policy_provider.h" #include "chrome/browser/policy/proto/cloud_policy.pb.h" diff --git a/chrome/browser/prefs/pref_service_uitest.cc b/chrome/browser/prefs/pref_service_uitest.cc index af2b1a6..029fc75 100644 --- a/chrome/browser/prefs/pref_service_uitest.cc +++ b/chrome/browser/prefs/pref_service_uitest.cc @@ -6,9 +6,9 @@ #include "base/command_line.h" #include "base/file_util.h" +#include "base/scoped_temp_dir.h" #include "base/test/test_file_util.h" #include "base/values.h" -#include "base/memory/scoped_temp_dir.h" #include "build/build_config.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc index 6539d50..b69fdeb 100644 --- a/chrome/browser/prerender/prerender_browsertest.cc +++ b/chrome/browser/prerender/prerender_browsertest.cc @@ -5,8 +5,8 @@ #include <deque> #include "base/command_line.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prerender/prerender_contents.h" diff --git a/chrome/browser/process_singleton.h b/chrome/browser/process_singleton.h index cc0ca08..e32c138 100644 --- a/chrome/browser/process_singleton.h +++ b/chrome/browser/process_singleton.h @@ -23,7 +23,7 @@ #endif // defined(OS_POSIX) #if defined(USE_X11) -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #endif // defined(USE_X11) class CommandLine; diff --git a/chrome/browser/process_singleton_uitest.cc b/chrome/browser/process_singleton_uitest.cc index 0d87622..65c41fa 100644 --- a/chrome/browser/process_singleton_uitest.cc +++ b/chrome/browser/process_singleton_uitest.cc @@ -15,14 +15,14 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/memory/ref_counted.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/threading/thread.h" -#include "base/test/test_timeouts.h" +#include "base/scoped_temp_dir.h" #include "base/synchronization/waitable_event.h" -#include "chrome/common/chrome_paths.h" +#include "base/test/test_timeouts.h" +#include "base/threading/thread.h" #include "chrome/common/chrome_constants.h" +#include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/test_launcher_utils.h" #include "chrome/test/ui/ui_test.h" diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc index 54bcbc9..cce457a 100644 --- a/chrome/browser/profiles/profile_manager_unittest.cc +++ b/chrome/browser/profiles/profile_manager_unittest.cc @@ -5,9 +5,9 @@ #include <string> #include "base/command_line.h" -#include "base/memory/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/system_monitor/system_monitor.h" #include "base/values.h" #include "chrome/browser/prefs/browser_prefs.h" diff --git a/chrome/browser/safe_browsing/bloom_filter_unittest.cc b/chrome/browser/safe_browsing/bloom_filter_unittest.cc index 62c5f46..f7f2260 100644 --- a/chrome/browser/safe_browsing/bloom_filter_unittest.cc +++ b/chrome/browser/safe_browsing/bloom_filter_unittest.cc @@ -14,8 +14,8 @@ #include "base/memory/ref_counted.h" #include "base/path_service.h" #include "base/rand_util.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" -#include "base/memory/scoped_temp_dir.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc index 9637580..1448694 100644 --- a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc +++ b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc @@ -6,11 +6,13 @@ #include "base/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "base/task.h" #include "chrome/browser/safe_browsing/client_side_detection_host.h" #include "chrome/browser/safe_browsing/client_side_detection_service.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" +#include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/safe_browsing/csd.pb.h" #include "chrome/common/safe_browsing/safebrowsing_messages.h" @@ -18,8 +20,6 @@ #include "chrome/test/ui_test_utils.h" #include "content/browser/browser_thread.h" #include "content/browser/renderer_host/test_render_view_host.h" -#include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" -#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "content/browser/tab_contents/test_tab_contents.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_test_sink.h" diff --git a/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc index 63a6dc0..f5660aa 100644 --- a/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc +++ b/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc @@ -12,9 +12,9 @@ #include "base/file_util_proxy.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/platform_file.h" +#include "base/scoped_temp_dir.h" #include "base/task.h" #include "base/time.h" #include "chrome/browser/safe_browsing/client_side_detection_service.h" diff --git a/chrome/browser/safe_browsing/prefix_set_unittest.cc b/chrome/browser/safe_browsing/prefix_set_unittest.cc index f0002b7f..62c0427 100644 --- a/chrome/browser/safe_browsing/prefix_set_unittest.cc +++ b/chrome/browser/safe_browsing/prefix_set_unittest.cc @@ -10,8 +10,8 @@ #include "base/logging.h" #include "base/md5.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.h" #include "base/rand_util.h" +#include "base/scoped_temp_dir.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc index 9a446a0..d9dd131e 100644 --- a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc @@ -8,14 +8,14 @@ #include "app/sql/statement.h" #include "base/file_util.h" #include "base/logging.h" -#include "base/memory/scoped_temp_dir.h" #include "base/message_loop.h" +#include "base/scoped_temp_dir.h" #include "base/time.h" -#include "crypto/sha2.h" #include "chrome/browser/safe_browsing/safe_browsing_database.h" #include "chrome/browser/safe_browsing/safe_browsing_store_file.h" #include "chrome/browser/safe_browsing/safe_browsing_store_unittest_helper.h" #include "content/browser/browser_thread.h" +#include "crypto/sha2.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/chrome/browser/search_engines/template_url_model_test_util.cc b/chrome/browser/search_engines/template_url_model_test_util.cc index bf71b2b..26d2491 100644 --- a/chrome/browser/search_engines/template_url_model_test_util.cc +++ b/chrome/browser/search_engines/template_url_model_test_util.cc @@ -4,9 +4,9 @@ #include "chrome/browser/search_engines/template_url_model_test_util.h" -#include "base/memory/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/threading/thread.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" diff --git a/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc b/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc index fe0171b..327420f 100644 --- a/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc +++ b/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc @@ -3,14 +3,14 @@ // found in the LICENSE file. #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" #include "base/memory/scoped_vector.h" +#include "base/scoped_temp_dir.h" #include "base/utf_string_conversions.h" #include "chrome/browser/search_engines/search_engine_type.h" #include "chrome/browser/search_engines/search_terms_data.h" #include "chrome/browser/search_engines/template_url.h" -#include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/browser/search_engines/template_url_model.h" +#include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/common/pref_names.h" #include "chrome/test/testing_pref_service.h" #include "chrome/test/testing_profile.h" diff --git a/chrome/browser/sessions/session_backend_unittest.cc b/chrome/browser/sessions/session_backend_unittest.cc index 17ca9cf..61503d4 100644 --- a/chrome/browser/sessions/session_backend_unittest.cc +++ b/chrome/browser/sessions/session_backend_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "base/stl_util-inl.h" #include "base/string_util.h" #include "chrome/browser/sessions/session_backend.h" diff --git a/chrome/browser/sessions/session_service_unittest.cc b/chrome/browser/sessions/session_service_unittest.cc index 0f74792..6781db4 100644 --- a/chrome/browser/sessions/session_service_unittest.cc +++ b/chrome/browser/sessions/session_service_unittest.cc @@ -5,8 +5,8 @@ #include "base/file_util.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/stl_util-inl.h" #include "base/string_number_conversions.h" #include "base/time.h" diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc index 0fe55c1..e9c7cdd 100644 --- a/chrome/browser/shell_integration_linux.cc +++ b/chrome/browser/shell_integration_linux.cc @@ -20,10 +20,10 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/i18n/file_util_icu.h" -#include "base/memory/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/path_service.h" #include "base/process_util.h" +#include "base/scoped_temp_dir.h" #include "base/string_number_conversions.h" #include "base/string_tokenizer.h" #include "base/task.h" diff --git a/chrome/browser/shell_integration_unittest.cc b/chrome/browser/shell_integration_unittest.cc index 63d1304..3158f51 100644 --- a/chrome/browser/shell_integration_unittest.cc +++ b/chrome/browser/shell_integration_unittest.cc @@ -8,8 +8,8 @@ #include "base/file_path.h" #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" #include "base/message_loop.h" +#include "base/scoped_temp_dir.h" #include "base/stl_util-inl.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/sync/engine/syncapi_unittest.cc b/chrome/browser/sync/engine/syncapi_unittest.cc index dca4954..ba18eb6 100644 --- a/chrome/browser/sync/engine/syncapi_unittest.cc +++ b/chrome/browser/sync/engine/syncapi_unittest.cc @@ -11,10 +11,10 @@ #include "base/basictypes.h" #include "base/format_macros.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.h" #include "base/message_loop.h" -#include "base/stringprintf.h" +#include "base/scoped_temp_dir.h" #include "base/string_number_conversions.h" +#include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/sync/engine/http_post_provider_factory.h" diff --git a/chrome/browser/sync/profile_sync_service_session_unittest.cc b/chrome/browser/sync/profile_sync_service_session_unittest.cc index 33f0baf..90bc56e 100644 --- a/chrome/browser/sync/profile_sync_service_session_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_session_unittest.cc @@ -6,8 +6,8 @@ #include <string> #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/stl_util-inl.h" #include "base/task.h" #include "chrome/browser/sessions/session_service.h" diff --git a/chrome/browser/sync/syncable/directory_backing_store_unittest.cc b/chrome/browser/sync/syncable/directory_backing_store_unittest.cc index 40ab3e3..48d43a5 100644 --- a/chrome/browser/sync/syncable/directory_backing_store_unittest.cc +++ b/chrome/browser/sync/syncable/directory_backing_store_unittest.cc @@ -11,7 +11,7 @@ #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/scoped_temp_dir.h" #include "base/stl_util-inl.h" #include "base/string_number_conversions.h" #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h" diff --git a/chrome/browser/sync/syncable/syncable_unittest.cc b/chrome/browser/sync/syncable/syncable_unittest.cc index ebd912b..c09b66b 100644 --- a/chrome/browser/sync/syncable/syncable_unittest.cc +++ b/chrome/browser/sync/syncable/syncable_unittest.cc @@ -24,7 +24,7 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "base/stringprintf.h" #include "base/threading/platform_thread.h" #include "base/values.h" diff --git a/chrome/browser/sync/util/user_settings_unittest.cc b/chrome/browser/sync/util/user_settings_unittest.cc index c4fcfcf..0aa57d4 100644 --- a/chrome/browser/sync/util/user_settings_unittest.cc +++ b/chrome/browser/sync/util/user_settings_unittest.cc @@ -7,7 +7,7 @@ #include "app/sql/statement.h" #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "base/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/browser/password_manager/encryptor.h" diff --git a/chrome/browser/themes/browser_theme_pack_unittest.cc b/chrome/browser/themes/browser_theme_pack_unittest.cc index a94ed54..76328f7 100644 --- a/chrome/browser/themes/browser_theme_pack_unittest.cc +++ b/chrome/browser/themes/browser_theme_pack_unittest.cc @@ -6,9 +6,9 @@ #include "base/file_util.h" #include "base/json/json_reader.h" -#include "base/memory/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/values.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/user_style_sheet_watcher_unittest.cc b/chrome/browser/user_style_sheet_watcher_unittest.cc index 59f52aa..8c729a1 100644 --- a/chrome/browser/user_style_sheet_watcher_unittest.cc +++ b/chrome/browser/user_style_sheet_watcher_unittest.cc @@ -4,11 +4,11 @@ #include "chrome/browser/user_style_sheet_watcher.h" -#include "base/basictypes.h" #include "base/base64.h" +#include "base/basictypes.h" #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" #include "base/message_loop.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "base/threading/thread.h" #include "content/browser/browser_thread.h" diff --git a/chrome/browser/webdata/web_database_migration_unittest.cc b/chrome/browser/webdata/web_database_migration_unittest.cc index f326c28..19613d4 100644 --- a/chrome/browser/webdata/web_database_migration_unittest.cc +++ b/chrome/browser/webdata/web_database_migration_unittest.cc @@ -6,7 +6,7 @@ #include "app/sql/statement.h" #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "base/stl_util-inl.h" #include "base/string16.h" #include "base/string_number_conversions.h" diff --git a/chrome/common/extensions/extension_file_util.cc b/chrome/common/extensions/extension_file_util.cc index 1c8b9fc..a6a85c3 100644 --- a/chrome/common/extensions/extension_file_util.cc +++ b/chrome/common/extensions/extension_file_util.cc @@ -9,17 +9,17 @@ #include "base/file_util.h" #include "base/logging.h" -#include "base/memory/scoped_temp_dir.h" #include "base/metrics/histogram.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/stringprintf.h" #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_action.h" -#include "chrome/common/extensions/extension_l10n_util.h" #include "chrome/common/extensions/extension_constants.h" +#include "chrome/common/extensions/extension_l10n_util.h" #include "chrome/common/extensions/extension_resource.h" #include "chrome/common/extensions/extension_sidebar_defaults.h" #include "content/common/json_value_serializer.h" diff --git a/chrome/common/extensions/extension_file_util_unittest.cc b/chrome/common/extensions/extension_file_util_unittest.cc index 5a6f782..39df382 100644 --- a/chrome/common/extensions/extension_file_util_unittest.cc +++ b/chrome/common/extensions/extension_file_util_unittest.cc @@ -5,8 +5,8 @@ #include "chrome/common/extensions/extension_file_util.h" #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/utf_string_conversions.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/common/extensions/extension_l10n_util_unittest.cc b/chrome/common/extensions/extension_l10n_util_unittest.cc index 211cc9c..bedbd52 100644 --- a/chrome/common/extensions/extension_l10n_util_unittest.cc +++ b/chrome/common/extensions/extension_l10n_util_unittest.cc @@ -6,8 +6,8 @@ #include "base/file_util.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/values.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/common/extensions/extension_resource_unittest.cc b/chrome/common/extensions/extension_resource_unittest.cc index e22f288..9424d5f 100644 --- a/chrome/common/extensions/extension_resource_unittest.cc +++ b/chrome/common/extensions/extension_resource_unittest.cc @@ -5,8 +5,8 @@ #include <algorithm> #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_l10n_util.h" diff --git a/chrome/common/extensions/extension_unpacker.cc b/chrome/common/extensions/extension_unpacker.cc index 4c5f30f..9a06bbc 100644 --- a/chrome/common/extensions/extension_unpacker.cc +++ b/chrome/common/extensions/extension_unpacker.cc @@ -8,12 +8,11 @@ #include "base/file_util.h" #include "base/memory/scoped_handle.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "net/base/file_stream.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_file_util.h" @@ -23,6 +22,7 @@ #include "content/common/common_param_traits.h" #include "content/common/json_value_serializer.h" #include "ipc/ipc_message_utils.h" +#include "net/base/file_stream.h" #include "third_party/skia/include/core/SkBitmap.h" #include "webkit/glue/image_decoder.h" diff --git a/chrome/common/extensions/extension_unpacker_unittest.cc b/chrome/common/extensions/extension_unpacker_unittest.cc index 80ed7a5..e53b5af 100644 --- a/chrome/common/extensions/extension_unpacker_unittest.cc +++ b/chrome/common/extensions/extension_unpacker_unittest.cc @@ -4,9 +4,9 @@ #include "base/file_util.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "base/values.h" -#include "base/memory/scoped_temp_dir.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_unpacker.h" diff --git a/chrome/common/important_file_writer_unittest.cc b/chrome/common/important_file_writer_unittest.cc index 39ccbc0..78a7894 100644 --- a/chrome/common/important_file_writer_unittest.cc +++ b/chrome/common/important_file_writer_unittest.cc @@ -8,8 +8,8 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/logging.h" -#include "base/memory/scoped_temp_dir.h" #include "base/message_loop.h" +#include "base/scoped_temp_dir.h" #include "base/threading/thread.h" #include "base/time.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/json_pref_store_unittest.cc b/chrome/common/json_pref_store_unittest.cc index d46f432..3330007 100644 --- a/chrome/common/json_pref_store_unittest.cc +++ b/chrome/common/json_pref_store_unittest.cc @@ -5,10 +5,10 @@ #include "base/file_util.h" #include "base/memory/ref_counted.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/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/threading/thread.h" diff --git a/chrome/common/json_value_serializer_unittest.cc b/chrome/common/json_value_serializer_unittest.cc index 1cdb59a..541ac8c 100644 --- a/chrome/common/json_value_serializer_unittest.cc +++ b/chrome/common/json_value_serializer_unittest.cc @@ -6,8 +6,8 @@ #include "base/file_util.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/string16.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" diff --git a/chrome/common/service_process_util_unittest.cc b/chrome/common/service_process_util_unittest.cc index 58aea81..81ca377 100644 --- a/chrome/common/service_process_util_unittest.cc +++ b/chrome/common/service_process_util_unittest.cc @@ -25,8 +25,8 @@ #endif #if defined(OS_LINUX) -#include <glib.h> #include "chrome/common/auto_start_linux.h" +#include <glib.h> #endif namespace { @@ -232,8 +232,8 @@ MULTIPROCESS_TEST_MAIN(ServiceProcessStateTestShutdown) { #include "base/file_util.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" -#include "base/memory/scoped_temp_dir.h" #include "base/message_loop.h" +#include "base/scoped_temp_dir.h" #include "base/stringprintf.h" #include "base/sys_string_conversions.h" #include "base/test/test_timeouts.h" diff --git a/chrome/common/zip_unittest.cc b/chrome/common/zip_unittest.cc index 8c02b31..38d7227 100644 --- a/chrome/common/zip_unittest.cc +++ b/chrome/common/zip_unittest.cc @@ -5,8 +5,8 @@ #include <set> #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/zip.h" diff --git a/chrome/installer/mini_installer/decompress_test.cc b/chrome/installer/mini_installer/decompress_test.cc index 1419b6b..9258412 100644 --- a/chrome/installer/mini_installer/decompress_test.cc +++ b/chrome/installer/mini_installer/decompress_test.cc @@ -5,8 +5,8 @@ #include <windows.h> #include "base/file_path.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "chrome/installer/mini_installer/decompress.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/installer/setup/chrome_frame_quick_enable.cc b/chrome/installer/setup/chrome_frame_quick_enable.cc index f489117..1df87f1 100644 --- a/chrome/installer/setup/chrome_frame_quick_enable.cc +++ b/chrome/installer/setup/chrome_frame_quick_enable.cc @@ -7,7 +7,7 @@ #include <windows.h> #include "base/logging.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "base/win/registry.h" #include "chrome/installer/setup/install_worker.h" diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc index 5211e5c..15e0847 100644 --- a/chrome/installer/setup/setup_main.cc +++ b/chrome/installer/setup/setup_main.cc @@ -14,9 +14,9 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/file_version_info.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" #include "base/process_util.h" +#include "base/scoped_temp_dir.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -37,14 +37,14 @@ #include "chrome/installer/util/channel_info.h" #include "chrome/installer/util/delete_after_reboot_helper.h" #include "chrome/installer/util/delete_tree_work_item.h" -#include "chrome/installer/util/google_update_settings.h" #include "chrome/installer/util/google_update_constants.h" +#include "chrome/installer/util/google_update_settings.h" #include "chrome/installer/util/helper.h" #include "chrome/installer/util/html_dialog.h" #include "chrome/installer/util/install_util.h" +#include "chrome/installer/util/installation_state.h" #include "chrome/installer/util/installation_validator.h" #include "chrome/installer/util/installer_state.h" -#include "chrome/installer/util/installation_state.h" #include "chrome/installer/util/l10n_string_util.h" #include "chrome/installer/util/logging_installer.h" #include "chrome/installer/util/lzma_util.h" diff --git a/chrome/installer/setup/setup_util_unittest.cc b/chrome/installer/setup/setup_util_unittest.cc index 13aa7b7e..61d3f15 100644 --- a/chrome/installer/setup/setup_util_unittest.cc +++ b/chrome/installer/setup/setup_util_unittest.cc @@ -6,8 +6,8 @@ #include "base/base_paths.h" #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "base/threading/platform_thread.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/installer/util/copy_tree_work_item.h b/chrome/installer/util/copy_tree_work_item.h index 415d073..845d882 100644 --- a/chrome/installer/util/copy_tree_work_item.h +++ b/chrome/installer/util/copy_tree_work_item.h @@ -8,7 +8,7 @@ #include "base/file_path.h" #include "base/gtest_prod_util.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "chrome/installer/util/work_item.h" // A WorkItem subclass that recursively copies a file system hierarchy from diff --git a/chrome/installer/util/copy_tree_work_item_unittest.cc b/chrome/installer/util/copy_tree_work_item_unittest.cc index 8660c74..f16f506 100644 --- a/chrome/installer/util/copy_tree_work_item_unittest.cc +++ b/chrome/installer/util/copy_tree_work_item_unittest.cc @@ -10,13 +10,13 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" #include "base/process_util.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "base/threading/platform_thread.h" -#include "chrome/installer/util/work_item.h" #include "chrome/installer/util/copy_tree_work_item.h" +#include "chrome/installer/util/work_item.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/installer/util/create_dir_work_item_unittest.cc b/chrome/installer/util/create_dir_work_item_unittest.cc index e929600..6d97bbe 100644 --- a/chrome/installer/util/create_dir_work_item_unittest.cc +++ b/chrome/installer/util/create_dir_work_item_unittest.cc @@ -7,11 +7,11 @@ #include "base/base_paths.h" #include "base/file_util.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" -#include "chrome/installer/util/work_item.h" #include "chrome/installer/util/create_dir_work_item.h" +#include "chrome/installer/util/work_item.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/installer/util/delete_tree_work_item.h b/chrome/installer/util/delete_tree_work_item.h index 5e90663..ab604cc 100644 --- a/chrome/installer/util/delete_tree_work_item.h +++ b/chrome/installer/util/delete_tree_work_item.h @@ -10,7 +10,7 @@ #include "base/file_path.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "chrome/installer/util/work_item.h" // A WorkItem subclass that recursively deletes a file system hierarchy at the diff --git a/chrome/installer/util/delete_tree_work_item_unittest.cc b/chrome/installer/util/delete_tree_work_item_unittest.cc index b22ba81..239e098 100644 --- a/chrome/installer/util/delete_tree_work_item_unittest.cc +++ b/chrome/installer/util/delete_tree_work_item_unittest.cc @@ -10,9 +10,9 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" #include "base/process_util.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "chrome/installer/util/delete_tree_work_item.h" #include "chrome/installer/util/work_item.h" diff --git a/chrome/installer/util/duplicate_tree_detector_unittest.cc b/chrome/installer/util/duplicate_tree_detector_unittest.cc index 6a168e6..3c0d623 100644 --- a/chrome/installer/util/duplicate_tree_detector_unittest.cc +++ b/chrome/installer/util/duplicate_tree_detector_unittest.cc @@ -7,7 +7,7 @@ #include <fstream> #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "chrome/installer/util/duplicate_tree_detector.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/installer/util/installer_state_unittest.cc b/chrome/installer/util/installer_state_unittest.cc index ba74c9e..c35fac4 100644 --- a/chrome/installer/util/installer_state_unittest.cc +++ b/chrome/installer/util/installer_state_unittest.cc @@ -9,9 +9,9 @@ #include "base/base_paths.h" #include "base/command_line.h" #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" #include "base/process_util.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/version.h" diff --git a/chrome/installer/util/lzma_util_unittest.cc b/chrome/installer/util/lzma_util_unittest.cc index e82d8bf..06a8dfd 100644 --- a/chrome/installer/util/lzma_util_unittest.cc +++ b/chrome/installer/util/lzma_util_unittest.cc @@ -7,7 +7,7 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "chrome/common/chrome_paths.h" #include "chrome/installer/util/lzma_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/installer/util/move_tree_work_item.h b/chrome/installer/util/move_tree_work_item.h index 16fec6e..c2eeb33 100644 --- a/chrome/installer/util/move_tree_work_item.h +++ b/chrome/installer/util/move_tree_work_item.h @@ -8,7 +8,7 @@ #include "base/file_path.h" #include "base/gtest_prod_util.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "chrome/installer/util/work_item.h" // A WorkItem subclass that recursively move a file system hierarchy from diff --git a/chrome/installer/util/product_unittest.h b/chrome/installer/util/product_unittest.h index 3419c7d..8635fc8 100644 --- a/chrome/installer/util/product_unittest.h +++ b/chrome/installer/util/product_unittest.h @@ -10,8 +10,8 @@ #include "base/file_path.h" #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/win/registry.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/installer/util/self_cleaning_temp_dir_unittest.cc b/chrome/installer/util/self_cleaning_temp_dir_unittest.cc index 935434c..5980575 100644 --- a/chrome/installer/util/self_cleaning_temp_dir_unittest.cc +++ b/chrome/installer/util/self_cleaning_temp_dir_unittest.cc @@ -6,7 +6,7 @@ #include <wincrypt.h> #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/installer/util/self_cleaning_temp_dir.h" diff --git a/chrome/installer/util/shell_util_unittest.cc b/chrome/installer/util/shell_util_unittest.cc index 7839f2b..f6d3dd1 100644 --- a/chrome/installer/util/shell_util_unittest.cc +++ b/chrome/installer/util/shell_util_unittest.cc @@ -10,7 +10,7 @@ #include "base/file_util.h" #include "base/path_service.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "base/win/scoped_comptr.h" #include "base/win/windows_version.h" #include "chrome/installer/util/browser_distribution.h" diff --git a/chrome/installer/util/work_item_list_unittest.cc b/chrome/installer/util/work_item_list_unittest.cc index 56d3a8b8..bee5a05 100644 --- a/chrome/installer/util/work_item_list_unittest.cc +++ b/chrome/installer/util/work_item_list_unittest.cc @@ -7,8 +7,8 @@ #include "base/base_paths.h" #include "base/file_util.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "base/win/registry.h" #include "chrome/installer/util/conditional_work_item_list.h" diff --git a/chrome/renderer/safe_browsing/scorer_unittest.cc b/chrome/renderer/safe_browsing/scorer_unittest.cc index 90a3de9..65349b4 100644 --- a/chrome/renderer/safe_browsing/scorer_unittest.cc +++ b/chrome/renderer/safe_browsing/scorer_unittest.cc @@ -9,8 +9,8 @@ #include "base/format_macros.h" #include "base/hash_tables.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/threading/thread.h" #include "chrome/renderer/safe_browsing/client_model.pb.h" #include "chrome/renderer/safe_browsing/features.h" diff --git a/chrome/service/service_utility_process_host.cc b/chrome/service/service_utility_process_host.cc index a49e434..190be02 100644 --- a/chrome/service/service_utility_process_host.cc +++ b/chrome/service/service_utility_process_host.cc @@ -6,9 +6,9 @@ #include "base/command_line.h" #include "base/file_util.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 "chrome/common/chrome_switches.h" #include "chrome/common/utility_messages.h" #include "ipc/ipc_switches.h" diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc index acdf889..bb27932 100644 --- a/chrome/test/automation/automation_proxy_uitest.cc +++ b/chrome/test/automation/automation_proxy_uitest.cc @@ -10,7 +10,7 @@ #include "base/file_util.h" #include "base/i18n/rtl.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/sys_info.h" @@ -30,8 +30,8 @@ #include "chrome/test/automation/proxy_launcher.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/automation/window_proxy.h" -#include "chrome/test/ui_test_utils.h" #include "chrome/test/ui/ui_test.h" +#include "chrome/test/ui_test_utils.h" #include "content/common/json_value_serializer.h" #include "net/base/host_port_pair.h" #include "net/base/net_util.h" diff --git a/chrome/test/automation/proxy_launcher.h b/chrome/test/automation/proxy_launcher.h index c4d5fb9..89b0d94 100644 --- a/chrome/test/automation/proxy_launcher.h +++ b/chrome/test/automation/proxy_launcher.h @@ -11,8 +11,8 @@ #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.h" #include "base/process.h" +#include "base/scoped_temp_dir.h" #include "base/time.h" class AutomationProxy; diff --git a/chrome/test/in_process_browser_test.h b/chrome/test/in_process_browser_test.h index 6d18545..3db36ab 100644 --- a/chrome/test/in_process_browser_test.h +++ b/chrome/test/in_process_browser_test.h @@ -9,7 +9,7 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "content/common/page_transition_types.h" #include "net/test/test_server.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/test/out_of_proc_test_runner.cc b/chrome/test/out_of_proc_test_runner.cc index 5d23954..9a3201e 100644 --- a/chrome/test/out_of_proc_test_runner.cc +++ b/chrome/test/out_of_proc_test_runner.cc @@ -13,8 +13,8 @@ #include "base/mac/scoped_nsautorelease_pool.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.h" #include "base/process_util.h" +#include "base/scoped_temp_dir.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/test/test_suite.h" diff --git a/chrome/test/sync/engine/test_directory_setter_upper.h b/chrome/test/sync/engine/test_directory_setter_upper.h index 75506c0..2d523fa 100644 --- a/chrome/test/sync/engine/test_directory_setter_upper.h +++ b/chrome/test/sync/engine/test_directory_setter_upper.h @@ -35,7 +35,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "chrome/browser/sync/syncable/directory_manager.h" #include "chrome/browser/sync/syncable/syncable.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h index ef6de3a..18f925a 100644 --- a/chrome/test/testing_profile.h +++ b/chrome/test/testing_profile.h @@ -8,7 +8,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "base/timer.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index c1dbe7c..2bda934 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -19,9 +19,9 @@ #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/path_service.h" #include "base/process_util.h" +#include "base/scoped_temp_dir.h" #include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/test/test_file_util.h" diff --git a/chrome/test/ui_test_utils.h b/chrome/test/ui_test_utils.h index ae4a411..2709fa9 100644 --- a/chrome/test/ui_test_utils.h +++ b/chrome/test/ui_test_utils.h @@ -12,8 +12,8 @@ #include <string> #include "base/basictypes.h" -#include "base/memory/scoped_temp_dir.h" #include "base/message_loop.h" +#include "base/scoped_temp_dir.h" #include "base/string16.h" #include "chrome/browser/ui/view_ids.h" #include "chrome/test/automation/dom_element_proxy.h" diff --git a/chrome/test/webdriver/session.cc b/chrome/test/webdriver/session.cc index 85e673b..c543429 100644 --- a/chrome/test/webdriver/session.cc +++ b/chrome/test/webdriver/session.cc @@ -14,14 +14,14 @@ #include "base/json/json_writer.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.h" #include "base/message_loop_proxy.h" #include "base/process.h" #include "base/process_util.h" -#include "base/stringprintf.h" +#include "base/scoped_temp_dir.h" #include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "base/synchronization/waitable_event.h" #include "base/test/test_timeouts.h" #include "base/threading/platform_thread.h" |