diff options
Diffstat (limited to 'chrome/browser/extensions')
74 files changed, 114 insertions, 114 deletions
diff --git a/chrome/browser/extensions/convert_user_script.cc b/chrome/browser/extensions/convert_user_script.cc index f0ec459..a09134b 100644 --- a/chrome/browser/extensions/convert_user_script.cc +++ b/chrome/browser/extensions/convert_user_script.cc @@ -10,8 +10,8 @@ #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/sha2.h" #include "base/string_util.h" #include "chrome/browser/extensions/user_script_master.h" diff --git a/chrome/browser/extensions/convert_user_script.h b/chrome/browser/extensions/convert_user_script.h index 678c6eb..ee502f8 100644 --- a/chrome/browser/extensions/convert_user_script.h +++ b/chrome/browser/extensions/convert_user_script.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,7 @@ #include <string> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" class Extension; class FilePath; diff --git a/chrome/browser/extensions/convert_user_script_unittest.cc b/chrome/browser/extensions/convert_user_script_unittest.cc index e9c73cb..248e3c2 100644 --- a/chrome/browser/extensions/convert_user_script_unittest.cc +++ b/chrome/browser/extensions/convert_user_script_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,8 +7,8 @@ #include "base/file_path.h" #include "base/file_util.h" +#include "base/memory/scoped_ptr.h" #include "base/path_service.h" -#include "base/scoped_ptr.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 66e3e8f..f3277f8 100644 --- a/chrome/browser/extensions/convert_web_app.cc +++ b/chrome/browser/extensions/convert_web_app.cc @@ -13,8 +13,8 @@ #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/sha2.h" #include "base/stringprintf.h" #include "base/time.h" diff --git a/chrome/browser/extensions/convert_web_app.h b/chrome/browser/extensions/convert_web_app.h index 4037265..0ce2814 100644 --- a/chrome/browser/extensions/convert_web_app.h +++ b/chrome/browser/extensions/convert_web_app.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,7 @@ #include <string> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" class Extension; diff --git a/chrome/browser/extensions/convert_web_app_unittest.cc b/chrome/browser/extensions/convert_web_app_unittest.cc index 00198be..918aca9 100644 --- a/chrome/browser/extensions/convert_web_app_unittest.cc +++ b/chrome/browser/extensions/convert_web_app_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -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 087ffde..3876dc5 100644 --- a/chrome/browser/extensions/crx_installer.cc +++ b/chrome/browser/extensions/crx_installer.cc @@ -8,8 +8,8 @@ #include "base/file_util.h" #include "base/lazy_instance.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/stringprintf.h" #include "base/task.h" diff --git a/chrome/browser/extensions/crx_installer.h b/chrome/browser/extensions/crx_installer.h index 598f660..990b639 100644 --- a/chrome/browser/extensions/crx_installer.h +++ b/chrome/browser/extensions/crx_installer.h @@ -9,7 +9,7 @@ #include <string> #include "base/file_path.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/version.h" #include "chrome/browser/extensions/extension_install_ui.h" #include "chrome/browser/extensions/sandboxed_extension_unpacker.h" diff --git a/chrome/browser/extensions/extension_accessibility_api.h b/chrome/browser/extensions/extension_accessibility_api.h index fe302a3..66e2271 100644 --- a/chrome/browser/extensions/extension_accessibility_api.h +++ b/chrome/browser/extensions/extension_accessibility_api.h @@ -10,7 +10,7 @@ #include <vector> #include "base/callback.h" -#include "base/singleton.h" +#include "base/memory/singleton.h" #include "base/values.h" #include "chrome/browser/accessibility_events.h" #include "chrome/browser/extensions/extension_function.h" diff --git a/chrome/browser/extensions/extension_bookmarks_module.h b/chrome/browser/extensions/extension_bookmarks_module.h index 8aef991..fd01c60 100644 --- a/chrome/browser/extensions/extension_bookmarks_module.h +++ b/chrome/browser/extensions/extension_bookmarks_module.h @@ -11,8 +11,8 @@ #include <string> #include "base/compiler_specific.h" -#include "base/ref_counted.h" -#include "base/singleton.h" +#include "base/memory/ref_counted.h" +#include "base/memory/singleton.h" #include "chrome/browser/bookmarks/bookmark_model_observer.h" #include "chrome/browser/extensions/extension_function.h" #include "chrome/browser/ui/shell_dialogs.h" diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc index 2b67187..c5eaddc 100644 --- a/chrome/browser/extensions/extension_browsertests_misc.cc +++ b/chrome/browser/extensions/extension_browsertests_misc.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/file_util.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/extensions/autoupdate_interceptor.h" diff --git a/chrome/browser/extensions/extension_cookies_api.h b/chrome/browser/extensions/extension_cookies_api.h index 8cfc397..7c72cde 100644 --- a/chrome/browser/extensions/extension_cookies_api.h +++ b/chrome/browser/extensions/extension_cookies_api.h @@ -11,8 +11,8 @@ #include <string> -#include "base/ref_counted.h" -#include "base/singleton.h" +#include "base/memory/ref_counted.h" +#include "base/memory/singleton.h" #include "base/time.h" #include "chrome/browser/extensions/extension_function.h" #include "chrome/browser/net/chrome_cookie_notification_details.h" diff --git a/chrome/browser/extensions/extension_creator.cc b/chrome/browser/extensions/extension_creator.cc index d75fe0a..d7d56c9 100644 --- a/chrome/browser/extensions/extension_creator.cc +++ b/chrome/browser/extensions/extension_creator.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,8 +10,8 @@ #include "base/crypto/rsa_private_key.h" #include "base/crypto/signature_creator.h" #include "base/file_util.h" -#include "base/scoped_handle.h" -#include "base/scoped_temp_dir.h" +#include "base/memory/scoped_handle.h" +#include "base/memory/scoped_temp_dir.h" #include "base/string_util.h" #include "chrome/browser/extensions/sandboxed_extension_unpacker.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/extension_data_deleter.h b/chrome/browser/extensions/extension_data_deleter.h index c921304..908c1f6 100644 --- a/chrome/browser/extensions/extension_data_deleter.h +++ b/chrome/browser/extensions/extension_data_deleter.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_DATA_DELETER_H_ #pragma once -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/string16.h" #include "content/browser/browser_thread.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/extensions/extension_debugger_api.cc b/chrome/browser/extensions/extension_debugger_api.cc index 947e4c3..cd668dc 100644 --- a/chrome/browser/extensions/extension_debugger_api.cc +++ b/chrome/browser/extensions/extension_debugger_api.cc @@ -9,7 +9,7 @@ #include <set> #include "base/json/json_writer.h" -#include "base/singleton.h" +#include "base/memory/singleton.h" #include "base/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/debugger/devtools_client_host.h" diff --git a/chrome/browser/extensions/extension_devtools_bridge.h b/chrome/browser/extensions/extension_devtools_bridge.h index 7e628e5..50b249e 100644 --- a/chrome/browser/extensions/extension_devtools_bridge.h +++ b/chrome/browser/extensions/extension_devtools_bridge.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,7 @@ #include <string> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "chrome/browser/debugger/devtools_client_host.h" #include "chrome/browser/extensions/extension_devtools_manager.h" #include "chrome/browser/extensions/extension_message_service.h" diff --git a/chrome/browser/extensions/extension_devtools_browsertests.cc b/chrome/browser/extensions/extension_devtools_browsertests.cc index 5887c1c..eaeb08d 100644 --- a/chrome/browser/extensions/extension_devtools_browsertests.cc +++ b/chrome/browser/extensions/extension_devtools_browsertests.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/stringprintf.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/debugger/devtools_client_host.h" diff --git a/chrome/browser/extensions/extension_devtools_manager.h b/chrome/browser/extensions/extension_devtools_manager.h index dc28456..09c85df 100644 --- a/chrome/browser/extensions/extension_devtools_manager.h +++ b/chrome/browser/extensions/extension_devtools_manager.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,8 +10,8 @@ #include <set> #include <string> -#include "base/linked_ptr.h" -#include "base/ref_counted.h" +#include "base/memory/linked_ptr.h" +#include "base/memory/ref_counted.h" class ExtensionDevToolsBridge; class MessageLoop; diff --git a/chrome/browser/extensions/extension_event_router.h b/chrome/browser/extensions/extension_event_router.h index 9aa6c21..3866c3c 100644 --- a/chrome/browser/extensions/extension_event_router.h +++ b/chrome/browser/extensions/extension_event_router.h @@ -10,7 +10,7 @@ #include <set> #include <string> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" diff --git a/chrome/browser/extensions/extension_event_router_forwarder.h b/chrome/browser/extensions/extension_event_router_forwarder.h index 49e5681..1a6f19d 100644 --- a/chrome/browser/extensions/extension_event_router_forwarder.h +++ b/chrome/browser/extensions/extension_event_router_forwarder.h @@ -9,7 +9,7 @@ #include <string> #include "base/basictypes.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "chrome/browser/profiles/profile.h" #include "content/browser/browser_thread.h" diff --git a/chrome/browser/extensions/extension_function.h b/chrome/browser/extensions/extension_function.h index 57a8665..7913703 100644 --- a/chrome/browser/extensions/extension_function.h +++ b/chrome/browser/extensions/extension_function.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,8 +9,8 @@ #include <string> #include <list> -#include "base/scoped_ptr.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" class ExtensionFunctionDispatcher; diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc index 38f57c6..40384a70 100644 --- a/chrome/browser/extensions/extension_function_dispatcher.cc +++ b/chrome/browser/extensions/extension_function_dispatcher.cc @@ -6,9 +6,9 @@ #include <map> +#include "base/memory/ref_counted.h" +#include "base/memory/singleton.h" #include "base/process_util.h" -#include "base/ref_counted.h" -#include "base/singleton.h" #include "base/values.h" #include "build/build_config.h" #include "chrome/browser/browser_list.h" diff --git a/chrome/browser/extensions/extension_function_dispatcher.h b/chrome/browser/extensions/extension_function_dispatcher.h index e87489b..8ec22ac 100644 --- a/chrome/browser/extensions/extension_function_dispatcher.h +++ b/chrome/browser/extensions/extension_function_dispatcher.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "googleurl/src/gurl.h" #include "ui/gfx/native_widget_types.h" diff --git a/chrome/browser/extensions/extension_history_api.h b/chrome/browser/extensions/extension_history_api.h index 52840ea..d51c3f4 100644 --- a/chrome/browser/extensions/extension_history_api.h +++ b/chrome/browser/extensions/extension_history_api.h @@ -9,7 +9,7 @@ #include <map> #include <string> -#include "base/singleton.h" +#include "base/memory/singleton.h" #include "chrome/browser/extensions/extension_function.h" #include "chrome/browser/history/history.h" #include "chrome/browser/history/history_notifications.h" diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc index f4f979a..e249a33 100644 --- a/chrome/browser/extensions/extension_host.cc +++ b/chrome/browser/extensions/extension_host.cc @@ -6,9 +6,9 @@ #include <list> +#include "base/memory/singleton.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" -#include "base/singleton.h" #include "base/string_util.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_shutdown.h" diff --git a/chrome/browser/extensions/extension_host.h b/chrome/browser/extensions/extension_host.h index 92a670b..50e050c 100644 --- a/chrome/browser/extensions/extension_host.h +++ b/chrome/browser/extensions/extension_host.h @@ -9,8 +9,8 @@ #include <string> #include <vector> +#include "base/memory/scoped_ptr.h" #include "base/perftimer.h" -#include "base/scoped_ptr.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h" #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h" diff --git a/chrome/browser/extensions/extension_info_map.h b/chrome/browser/extensions/extension_info_map.h index 7d872ba..0a90cd1 100644 --- a/chrome/browser/extensions/extension_info_map.h +++ b/chrome/browser/extensions/extension_info_map.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/file_path.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "chrome/common/extensions/extension_extent.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/extensions/extension_info_private_api_chromeos.h b/chrome/browser/extensions/extension_info_private_api_chromeos.h index fbaa76f..0ae43fe 100644 --- a/chrome/browser/extensions/extension_info_private_api_chromeos.h +++ b/chrome/browser/extensions/extension_info_private_api_chromeos.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/extension_function.h" class DictionaryValue; diff --git a/chrome/browser/extensions/extension_management_api.h b/chrome/browser/extensions/extension_management_api.h index 3a2850d..f7a75e5 100644 --- a/chrome/browser/extensions/extension_management_api.h +++ b/chrome/browser/extensions/extension_management_api.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_MANAGEMENT_API_H__ #pragma once -#include "base/singleton.h" +#include "base/memory/singleton.h" #include "chrome/browser/extensions/extension_function.h" #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" diff --git a/chrome/browser/extensions/extension_management_browsertest.cc b/chrome/browser/extensions/extension_management_browsertest.cc index 14c0ac4..4a12c25 100644 --- a/chrome/browser/extensions/extension_management_browsertest.cc +++ b/chrome/browser/extensions/extension_management_browsertest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/stl_util-inl.h" #include "chrome/browser/extensions/autoupdate_interceptor.h" #include "chrome/browser/extensions/extension_browsertest.h" diff --git a/chrome/browser/extensions/extension_menu_manager.h b/chrome/browser/extensions/extension_menu_manager.h index 1834b41..2718c7c 100644 --- a/chrome/browser/extensions/extension_menu_manager.h +++ b/chrome/browser/extensions/extension_menu_manager.h @@ -13,7 +13,7 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/string16.h" #include "chrome/browser/extensions/extension_icon_manager.h" #include "chrome/common/extensions/extension_extent.h" diff --git a/chrome/browser/extensions/extension_menu_manager_unittest.cc b/chrome/browser/extensions/extension_menu_manager_unittest.cc index 894d49a..a718ded 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/scoped_vector.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_message_service.h b/chrome/browser/extensions/extension_message_service.h index d653d56..5f01a9c 100644 --- a/chrome/browser/extensions/extension_message_service.h +++ b/chrome/browser/extensions/extension_message_service.h @@ -10,7 +10,7 @@ #include <set> #include <string> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" #include "ipc/ipc_message.h" diff --git a/chrome/browser/extensions/extension_pref_value_map_unittest.cc b/chrome/browser/extensions/extension_pref_value_map_unittest.cc index 54be441..75af385 100644 --- a/chrome/browser/extensions/extension_pref_value_map_unittest.cc +++ b/chrome/browser/extensions/extension_pref_value_map_unittest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/basictypes.h" -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/values.h" #include "chrome/browser/extensions/extension_pref_value_map.h" #include "chrome/common/pref_store_observer_mock.h" diff --git a/chrome/browser/extensions/extension_preference_api.cc b/chrome/browser/extensions/extension_preference_api.cc index d4b8410..6aa5737 100644 --- a/chrome/browser/extensions/extension_preference_api.cc +++ b/chrome/browser/extensions/extension_preference_api.cc @@ -7,7 +7,7 @@ #include <map> #include "base/json/json_writer.h" -#include "base/singleton.h" +#include "base/memory/singleton.h" #include "base/stl_util-inl.h" #include "base/stringprintf.h" #include "base/values.h" diff --git a/chrome/browser/extensions/extension_prefs.h b/chrome/browser/extensions/extension_prefs.h index 84c52a1..de44545 100644 --- a/chrome/browser/extensions/extension_prefs.h +++ b/chrome/browser/extensions/extension_prefs.h @@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/linked_ptr.h" +#include "base/memory/linked_ptr.h" #include "base/time.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc index 6baf3f6..40e3036 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" diff --git a/chrome/browser/extensions/extension_process_manager.h b/chrome/browser/extensions/extension_process_manager.h index f7b4c21..6546aa3 100644 --- a/chrome/browser/extensions/extension_process_manager.h +++ b/chrome/browser/extensions/extension_process_manager.h @@ -10,7 +10,7 @@ #include <set> #include <string> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "chrome/common/view_types.h" #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" diff --git a/chrome/browser/extensions/extension_proxy_api.h b/chrome/browser/extensions/extension_proxy_api.h index 7360ce2..c7a40ed 100644 --- a/chrome/browser/extensions/extension_proxy_api.h +++ b/chrome/browser/extensions/extension_proxy_api.h @@ -7,7 +7,7 @@ #include <string> -#include "base/singleton.h" +#include "base/memory/singleton.h" #include "chrome/browser/extensions/extension_preference_api.h" #include "chrome/browser/prefs/proxy_prefs.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/extensions/extension_rlz_module.cc b/chrome/browser/extensions/extension_rlz_module.cc index bd85cf1..c789a86 100644 --- a/chrome/browser/extensions/extension_rlz_module.cc +++ b/chrome/browser/extensions/extension_rlz_module.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "chrome/browser/extensions/extension_rlz_module.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/threading/thread_restrictions.h" #include "base/values.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h index e1d1cbe..fb4ea2e 100644 --- a/chrome/browser/extensions/extension_service.h +++ b/chrome/browser/extensions/extension_service.h @@ -14,8 +14,8 @@ #include "base/command_line.h" #include "base/file_path.h" #include "base/gtest_prod_util.h" -#include "base/linked_ptr.h" -#include "base/ref_counted.h" +#include "base/memory/linked_ptr.h" +#include "base/memory/ref_counted.h" #include "base/task.h" #include "base/time.h" #include "base/tuple.h" diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index 02f8e6c..f8aeb51 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -12,9 +12,9 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/json/json_reader.h" +#include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "base/scoped_ptr.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 1f29f0c..8045ee8 100644 --- a/chrome/browser/extensions/extension_service_unittest.h +++ b/chrome/browser/extensions/extension_service_unittest.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,10 +7,10 @@ #pragma once #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/ref_counted.h" -#include "base/scoped_ptr.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_tab_id_map.h b/chrome/browser/extensions/extension_tab_id_map.h index 1fce693..1c7af9e 100644 --- a/chrome/browser/extensions/extension_tab_id_map.h +++ b/chrome/browser/extensions/extension_tab_id_map.h @@ -10,7 +10,7 @@ #include <utility> #include "base/basictypes.h" -#include "base/singleton.h" +#include "base/memory/singleton.h" // This class keeps track of a map between renderer IDs and tab/window IDs, for // use on the IO thread. All methods should be called on the IO thread except diff --git a/chrome/browser/extensions/extension_test_api.cc b/chrome/browser/extensions/extension_test_api.cc index 721f033..139d7f1 100644 --- a/chrome/browser/extensions/extension_test_api.cc +++ b/chrome/browser/extensions/extension_test_api.cc @@ -6,7 +6,7 @@ #include <string> -#include "base/singleton.h" +#include "base/memory/singleton.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extensions_quota_service.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/extensions/extension_tts_api.h b/chrome/browser/extensions/extension_tts_api.h index 9f7da37..226d8e5 100644 --- a/chrome/browser/extensions/extension_tts_api.h +++ b/chrome/browser/extensions/extension_tts_api.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,7 @@ #include <queue> #include <string> -#include "base/singleton.h" +#include "base/memory/singleton.h" #include "base/task.h" #include "chrome/browser/extensions/extension_function.h" #include "chrome/browser/extensions/extension_tts_api_util.h" diff --git a/chrome/browser/extensions/extension_tts_api_chromeos.cc b/chrome/browser/extensions/extension_tts_api_chromeos.cc index 4e6ce65..403a4a7 100644 --- a/chrome/browser/extensions/extension_tts_api_chromeos.cc +++ b/chrome/browser/extensions/extension_tts_api_chromeos.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "chrome/browser/extensions/extension_tts_api.h" -#include "base/singleton.h" +#include "base/memory/singleton.h" #include "base/string_number_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/speech_synthesis_library.h" diff --git a/chrome/browser/extensions/extension_tts_api_linux.cc b/chrome/browser/extensions/extension_tts_api_linux.cc index 7b89799..d008526 100644 --- a/chrome/browser/extensions/extension_tts_api_linux.cc +++ b/chrome/browser/extensions/extension_tts_api_linux.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "chrome/browser/extensions/extension_tts_api.h" -#include "base/singleton.h" +#include "base/memory/singleton.h" namespace util = extension_tts_api_util; diff --git a/chrome/browser/extensions/extension_tts_api_mac.mm b/chrome/browser/extensions/extension_tts_api_mac.mm index 2e97aca..dde3df9 100644 --- a/chrome/browser/extensions/extension_tts_api_mac.mm +++ b/chrome/browser/extensions/extension_tts_api_mac.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #include <string> -#include "base/singleton.h" +#include "base/memory/singleton.h" #include "base/values.h" #include "chrome/browser/extensions/extension_function.h" diff --git a/chrome/browser/extensions/extension_tts_api_win.cc b/chrome/browser/extensions/extension_tts_api_win.cc index 5b2a846..30e2236 100644 --- a/chrome/browser/extensions/extension_tts_api_win.cc +++ b/chrome/browser/extensions/extension_tts_api_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,8 +8,8 @@ #include <atlcom.h> #include <sapi.h> +#include "base/memory/singleton.h" #include "base/scoped_comptr_win.h" -#include "base/singleton.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/extensions/extension_updater.h b/chrome/browser/extensions/extension_updater.h index fe2ea11..a2f67c6 100644 --- a/chrome/browser/extensions/extension_updater.h +++ b/chrome/browser/extensions/extension_updater.h @@ -13,9 +13,9 @@ #include <vector> #include "base/gtest_prod_util.h" -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" -#include "base/scoped_temp_dir.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" +#include "base/memory/scoped_temp_dir.h" #include "base/task.h" #include "base/time.h" #include "base/timer.h" diff --git a/chrome/browser/extensions/extension_updater_unittest.cc b/chrome/browser/extensions/extension_updater_unittest.cc index 4c08abb..1e48668 100644 --- a/chrome/browser/extensions/extension_updater_unittest.cc +++ b/chrome/browser/extensions/extension_updater_unittest.cc @@ -5,7 +5,7 @@ #include <map> #include "base/file_util.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/stl_util-inl.h" #include "base/string_number_conversions.h" #include "base/string_split.h" diff --git a/chrome/browser/extensions/extension_web_ui.h b/chrome/browser/extensions/extension_web_ui.h index ad35865..e4821a8 100644 --- a/chrome/browser/extensions/extension_web_ui.h +++ b/chrome/browser/extensions/extension_web_ui.h @@ -8,7 +8,7 @@ #include <string> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/extension_bookmark_manager_api.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" #include "chrome/browser/favicon_service.h" diff --git a/chrome/browser/extensions/extension_webnavigation_api.h b/chrome/browser/extensions/extension_webnavigation_api.h index 29854aa..e51a248 100644 --- a/chrome/browser/extensions/extension_webnavigation_api.h +++ b/chrome/browser/extensions/extension_webnavigation_api.h @@ -12,7 +12,7 @@ #include <map> -#include "base/singleton.h" +#include "base/memory/singleton.h" #include "chrome/browser/extensions/extension_function.h" #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" diff --git a/chrome/browser/extensions/extension_webrequest_api.h b/chrome/browser/extensions/extension_webrequest_api.h index 5d64fdc..32a9317 100644 --- a/chrome/browser/extensions/extension_webrequest_api.h +++ b/chrome/browser/extensions/extension_webrequest_api.h @@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/singleton.h" +#include "base/memory/singleton.h" #include "chrome/browser/extensions/extension_function.h" #include "chrome/browser/profiles/profile.h" #include "ipc/ipc_message.h" diff --git a/chrome/browser/extensions/extensions_quota_service.h b/chrome/browser/extensions/extensions_quota_service.h index b9880d0..525729e 100644 --- a/chrome/browser/extensions/extensions_quota_service.h +++ b/chrome/browser/extensions/extensions_quota_service.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -20,7 +20,7 @@ #include <string> #include "base/hash_tables.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/time.h" #include "base/timer.h" #include "base/values.h" diff --git a/chrome/browser/extensions/extensions_startup.h b/chrome/browser/extensions/extensions_startup.h index 2dee7d3..2a860db 100644 --- a/chrome/browser/extensions/extensions_startup.h +++ b/chrome/browser/extensions/extensions_startup.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_EXTENSIONS_EXTENSIONS_STARTUP_H_ #pragma once -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/pack_extension_job.h" class CommandLine; diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc index 429f715..9f326f7 100644 --- a/chrome/browser/extensions/extensions_ui.cc +++ b/chrome/browser/extensions/extensions_ui.cc @@ -9,7 +9,7 @@ #include "base/base64.h" #include "base/callback.h" #include "base/file_util.h" -#include "base/singleton.h" +#include "base/memory/singleton.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/threading/thread.h" diff --git a/chrome/browser/extensions/extensions_ui.h b/chrome/browser/extensions/extensions_ui.h index 76c5080..b2ae8b2 100644 --- a/chrome/browser/extensions/extensions_ui.h +++ b/chrome/browser/extensions/extensions_ui.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/extension_uninstall_dialog.h" #include "chrome/browser/extensions/pack_extension_job.h" #include "chrome/browser/ui/shell_dialogs.h" diff --git a/chrome/browser/extensions/external_extension_loader.h b/chrome/browser/extensions/external_extension_loader.h index 7791664..fb2185c 100644 --- a/chrome/browser/extensions/external_extension_loader.h +++ b/chrome/browser/extensions/external_extension_loader.h @@ -7,8 +7,8 @@ #pragma once #include "base/file_path.h" -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" class DictionaryValue; class ExternalExtensionProviderImpl; diff --git a/chrome/browser/extensions/external_extension_provider_impl.cc b/chrome/browser/extensions/external_extension_provider_impl.cc index 171d544..10a0e11 100644 --- a/chrome/browser/extensions/external_extension_provider_impl.cc +++ b/chrome/browser/extensions/external_extension_provider_impl.cc @@ -7,7 +7,7 @@ #include "app/app_paths.h" #include "base/file_path.h" #include "base/logging.h" -#include "base/linked_ptr.h" +#include "base/memory/linked_ptr.h" #include "base/path_service.h" #include "base/values.h" #include "base/version.h" diff --git a/chrome/browser/extensions/external_extension_provider_impl.h b/chrome/browser/extensions/external_extension_provider_impl.h index 2856db9..6e0cd12 100644 --- a/chrome/browser/extensions/external_extension_provider_impl.h +++ b/chrome/browser/extensions/external_extension_provider_impl.h @@ -8,7 +8,7 @@ #include "chrome/browser/extensions/external_extension_provider_interface.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "chrome/browser/extensions/external_extension_loader.h" class DictionaryValue; diff --git a/chrome/browser/extensions/external_extension_provider_interface.h b/chrome/browser/extensions/external_extension_provider_interface.h index 982b738..7ad44c3 100644 --- a/chrome/browser/extensions/external_extension_provider_interface.h +++ b/chrome/browser/extensions/external_extension_provider_interface.h @@ -8,7 +8,7 @@ #include <vector> -#include "base/linked_ptr.h" +#include "base/memory/linked_ptr.h" #include "chrome/common/extensions/extension.h" class FilePath; diff --git a/chrome/browser/extensions/external_pref_extension_loader.h b/chrome/browser/extensions/external_pref_extension_loader.h index 0590014..37b8196 100644 --- a/chrome/browser/extensions/external_pref_extension_loader.h +++ b/chrome/browser/extensions/external_pref_extension_loader.h @@ -10,7 +10,7 @@ #include <string> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/values.h" // A specialization of the ExternalExtensionLoader that uses a json file to diff --git a/chrome/browser/extensions/file_reader.h b/chrome/browser/extensions/file_reader.h index c26ce11..202bf44 100644 --- a/chrome/browser/extensions/file_reader.h +++ b/chrome/browser/extensions/file_reader.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,7 +9,7 @@ #include <string> #include "base/callback.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "chrome/common/extensions/extension_resource.h" class MessageLoop; diff --git a/chrome/browser/extensions/image_loading_tracker.h b/chrome/browser/extensions/image_loading_tracker.h index 74a9668..813af06 100644 --- a/chrome/browser/extensions/image_loading_tracker.h +++ b/chrome/browser/extensions/image_loading_tracker.h @@ -8,7 +8,7 @@ #include <map> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" diff --git a/chrome/browser/extensions/pack_extension_job.h b/chrome/browser/extensions/pack_extension_job.h index 29d8694..06a06ce 100644 --- a/chrome/browser/extensions/pack_extension_job.h +++ b/chrome/browser/extensions/pack_extension_job.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,7 +9,7 @@ #include <string> #include "base/file_path.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/string16.h" #include "content/browser/browser_thread.h" diff --git a/chrome/browser/extensions/sandboxed_extension_unpacker.cc b/chrome/browser/extensions/sandboxed_extension_unpacker.cc index d7a9b1b..739eb79 100644 --- a/chrome/browser/extensions/sandboxed_extension_unpacker.cc +++ b/chrome/browser/extensions/sandboxed_extension_unpacker.cc @@ -10,10 +10,10 @@ #include "base/crypto/signature_verifier.h" #include "base/file_util.h" #include "base/file_util_proxy.h" +#include "base/memory/scoped_handle.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" #include "base/path_service.h" -#include "base/scoped_handle.h" #include "base/task.h" #include "base/utf_string_conversions.h" // TODO(viettrungluu): delete me. #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/extensions/sandboxed_extension_unpacker.h b/chrome/browser/extensions/sandboxed_extension_unpacker.h index ee78a8e..5d698d7 100644 --- a/chrome/browser/extensions/sandboxed_extension_unpacker.h +++ b/chrome/browser/extensions/sandboxed_extension_unpacker.h @@ -9,8 +9,8 @@ #include <string> #include "base/file_path.h" -#include "base/ref_counted.h" -#include "base/scoped_temp_dir.h" +#include "base/memory/ref_counted.h" +#include "base/memory/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 ecc521c..973845a 100644 --- a/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc +++ b/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #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/ref_counted.h" -#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "chrome/browser/extensions/sandboxed_extension_unpacker.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc index ba8d957..4acac36 100644 --- a/chrome/browser/extensions/test_extension_prefs.cc +++ b/chrome/browser/extensions/test_extension_prefs.cc @@ -5,9 +5,9 @@ #include "chrome/browser/extensions/test_extension_prefs.h" #include "base/file_util.h" +#include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" -#include "base/scoped_ptr.h" #include "base/values.h" #include "base/synchronization/waitable_event.h" #include "chrome/browser/extensions/extension_pref_store.h" diff --git a/chrome/browser/extensions/test_extension_prefs.h b/chrome/browser/extensions/test_extension_prefs.h index af6a522..b37f793 100644 --- a/chrome/browser/extensions/test_extension_prefs.h +++ b/chrome/browser/extensions/test_extension_prefs.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,8 +8,8 @@ #include <string> -#include "base/scoped_ptr.h" -#include "base/scoped_temp_dir.h" +#include "base/memory/scoped_ptr.h" +#include "base/memory/scoped_temp_dir.h" #include "chrome/common/extensions/extension.h" class DictionaryValue; diff --git a/chrome/browser/extensions/user_script_listener.h b/chrome/browser/extensions/user_script_listener.h index a81cd3b..c771a12 100644 --- a/chrome/browser/extensions/user_script_listener.h +++ b/chrome/browser/extensions/user_script_listener.h @@ -8,7 +8,7 @@ #include <list> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "content/browser/renderer_host/resource_queue.h" #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" diff --git a/chrome/browser/extensions/user_script_master.h b/chrome/browser/extensions/user_script_master.h index 1964199..3b883df 100644 --- a/chrome/browser/extensions/user_script_master.h +++ b/chrome/browser/extensions/user_script_master.h @@ -8,7 +8,7 @@ #include "base/file_path.h" #include "base/gtest_prod_util.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/shared_memory.h" #include "chrome/common/extensions/user_script.h" #include "content/browser/browser_thread.h" |