Move ExtensionFunction to the extensions component.

TBR=sky@chromium.org
BUG=162530

Review URL: https://codereview.chromium.org/64273006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234673 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/extensions/info_private_api.h

@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/compiler_specific.h"
-#include "chrome/browser/extensions/extension_function.h"
+#include "extensions/browser/extension_function.h"
 
 namespace base {
 class Value;

chrome/browser/chromeos/extensions/input_method_api.h

@@ -9,7 +9,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
 #include "chrome/browser/extensions/event_router.h"
-#include "chrome/browser/extensions/extension_function.h"
+#include "extensions/browser/extension_function.h"
 
 namespace chromeos {
 class ExtensionInputMethodEventRouter;

chrome/browser/chromeos/extensions/media_player_api.h

@@ -11,7 +11,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
-#include "chrome/browser/extensions/extension_function.h"
+#include "extensions/browser/extension_function.h"
 
 class Profile;
 

chrome/browser/chromeos/extensions/wallpaper_function_base.h

@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_WALLPAPER_FUNCTION_BASE_H_
 
 #include "ash/desktop_background/desktop_background_controller.h"
-#include "chrome/browser/extensions/extension_function.h"
+#include "extensions/browser/extension_function.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace wallpaper_api_util {

chrome/browser/extensions/api/alarms/alarm_manager.h

@@ -14,10 +14,10 @@
 #include "base/memory/weak_ptr.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
-#include "chrome/browser/extensions/extension_function.h"
 #include "chrome/common/extensions/api/alarms.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
+#include "extensions/browser/extension_function.h"
 
 class Profile;
 

chrome/browser/extensions/api/app_runtime/app_runtime_api.h

@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_EXTENSIONS_API_APP_RUNTIME_APP_RUNTIME_API_H_
 
 #include "base/strings/string16.h"
-#include "chrome/browser/extensions/extension_function.h"
+#include "extensions/browser/extension_function.h"
 
 class Profile;
 

chrome/browser/extensions/api/cast_channel/cast_channel_api.h

@@ -12,8 +12,8 @@
 #include "chrome/browser/extensions/api/api_resource_manager.h"
 #include "chrome/browser/extensions/api/cast_channel/cast_socket.h"
 #include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
-#include "chrome/browser/extensions/extension_function.h"
 #include "chrome/common/extensions/api/cast_channel.h"
+#include "extensions/browser/extension_function.h"
 
 class GURL;
 class Profile;

chrome/browser/extensions/api/command_line_private/command_line_private_api.h

@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_EXTENSIONS_API_COMMAND_LINE_PRIVATE_COMMAND_LINE_PRIVATE_API_H__
 #define CHROME_BROWSER_EXTENSIONS_API_COMMAND_LINE_PRIVATE_COMMAND_LINE_PRIVATE_API_H__
 
-#include "chrome/browser/extensions/extension_function.h"
+#include "extensions/browser/extension_function.h"
 
 namespace extensions {
 

chrome/browser/extensions/api/cookies/cookies_api.h

@@ -66,7 +66,7 @@ class CookiesEventRouter : public content::NotificationObserver {
 // AsyncExtensionFunction, and are not threadsafe, so they should not be
 // concurrently accessed from multiple threads. They modify |result_| and other
 // member variables directly.
-// See chrome/browser/extensions/extension_function.h for more information.
+// See extensions/browser/extension_function.h for more information.
 class CookiesFunction : public ChromeAsyncExtensionFunction {
  protected:
   virtual ~CookiesFunction() {}

chrome/browser/extensions/api/developer_private/entry_picker.h

@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_EXTENSIONS_API_DEVELOPER_PRIVATE_ENTRY_PICKER_H_
 #define CHROME_BROWSER_EXTENSIONS_API_DEVELOPER_PRIVATE_ENTRY_PICKER_H_
 
-#include "chrome/browser/extensions/extension_function.h"
+#include "extensions/browser/extension_function.h"
 #include "ui/shell_dialogs/select_file_dialog.h"
 
 namespace content {

chrome/browser/extensions/api/dns/dns_api.h

@@ -7,8 +7,8 @@
 
 #include <string>
 
-#include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/io_thread.h"
+#include "extensions/browser/extension_function.h"
 #include "net/base/address_list.h"
 #include "net/base/completion_callback.h"
 #include "net/dns/host_resolver.h"

chrome/browser/extensions/api/identity_private/identity_private_api.h

@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_EXTENSIONS_API_IDENTITY_PRIVATE_IDENTITY_PRIVATE_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_IDENTITY_PRIVATE_IDENTITY_PRIVATE_API_H_
 
-#include "chrome/browser/extensions/extension_function.h"
+#include "extensions/browser/extension_function.h"
 
 namespace extensions {
 
@@ -25,6 +25,6 @@ class IdentityPrivateGetResourcesFunction : public SyncExtensionFunction {
   DISALLOW_COPY_AND_ASSIGN(IdentityPrivateGetResourcesFunction);
 };
 
-}  // extensions
+}  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_IDENTITY_PRIVATE_IDENTITY_PRIVATE_API_H_

chrome/browser/extensions/api/idltest/idltest_api.h

@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_EXTENSIONS_API_IDLTEST_IDLTEST_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_IDLTEST_IDLTEST_API_H_
 
-#include "chrome/browser/extensions/extension_function.h"
+#include "extensions/browser/extension_function.h"
 
 class IdltestSendArrayBufferFunction : public SyncExtensionFunction {
  public:

chrome/browser/extensions/api/input/input.h

@@ -7,7 +7,7 @@
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
-#include "chrome/browser/extensions/extension_function.h"
+#include "extensions/browser/extension_function.h"
 
 class Profile;
 

chrome/browser/extensions/api/input_ime/input_ime_api.h

@@ -13,11 +13,11 @@
 #include "base/values.h"
 #include "chrome/browser/chromeos/input_method/input_method_engine.h"
 #include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
-#include "chrome/browser/extensions/extension_function.h"
 #include "chrome/common/extensions/extension.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
+#include "extensions/browser/extension_function.h"
 
 class Profile;
 

chrome/browser/extensions/api/log_private/log_private_api.h

@@ -10,8 +10,8 @@
 #include "chrome/browser/chromeos/system_logs/about_system_logs_fetcher.h"
 #include "chrome/browser/extensions/api/log_private/filter_handler.h"
 #include "chrome/browser/extensions/api/log_private/log_parser.h"
-#include "chrome/browser/extensions/extension_function.h"
 #include "chrome/common/extensions/api/log_private.h"
+#include "extensions/browser/extension_function.h"
 
 namespace extensions {
 

chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc

@@ -16,8 +16,8 @@
 #include "chrome/browser/extensions/api/log_private/filter_handler.h"
 #include "chrome/browser/extensions/api/log_private/log_parser.h"
 #include "chrome/browser/extensions/api/log_private/syslog_parser.h"
-#include "chrome/browser/extensions/extension_function.h"
 #include "chrome/common/extensions/api/log_private.h"
+#include "extensions/browser/extension_function.h"
 
 namespace extensions {
 namespace {

chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc

@@ -16,7 +16,6 @@
 #include "chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.h"
 #include "chrome/browser/extensions/event_names.h"
 #include "chrome/browser/extensions/event_router.h"
-#include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_util.h"
@@ -27,6 +26,7 @@
 #include "chrome/common/extensions/api/media_galleries_private/media_galleries_handler.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
+#include "extensions/browser/extension_function.h"
 
 using base::DictionaryValue;
 using base::ListValue;

chrome/browser/extensions/api/metrics_private/metrics_private_api.h

@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/metrics/histogram.h"
-#include "chrome/browser/extensions/extension_function.h"
+#include "extensions/browser/extension_function.h"
 
 namespace extensions {
 

chrome/browser/extensions/api/music_manager_private/music_manager_private_api.h

@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_EXTENSIONS_API_MUSIC_MANAGER_PRIVATE_MUSIC_MANAGER_PRIVATE_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_MUSIC_MANAGER_PRIVATE_MUSIC_MANAGER_PRIVATE_API_H_
 
-#include "chrome/browser/extensions/extension_function.h"
+#include "extensions/browser/extension_function.h"
 
 namespace extensions {
 namespace api {

chrome/browser/extensions/api/notifications/notifications_api.h

@@ -9,8 +9,8 @@
 
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/extensions/api/api_function.h"
-#include "chrome/browser/extensions/extension_function.h"
 #include "chrome/common/extensions/api/notifications.h"
+#include "extensions/browser/extension_function.h"
 #include "ui/message_center/notification_types.h"
 
 class Notification;
@@ -113,8 +113,8 @@ class NotificationsGetAllFunction : public NotificationsApiFunction {
   DECLARE_EXTENSION_FUNCTION("notifications.getAll", NOTIFICATIONS_GET_ALL)
 };
 
-class NotificationsGetPermissionLevelFunction :
-    public NotificationsApiFunction {
+class NotificationsGetPermissionLevelFunction
+    : public NotificationsApiFunction {
  public:
   NotificationsGetPermissionLevelFunction();
 

chrome/browser/extensions/api/power/power_api.h

@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_EXTENSIONS_API_POWER_POWER_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_POWER_POWER_API_H_
 
-#include "chrome/browser/extensions/extension_function.h"
+#include "extensions/browser/extension_function.h"
 
 namespace extensions {
 

chrome/browser/extensions/api/serial/serial_apitest.cc

@@ -10,11 +10,11 @@
 #include "chrome/browser/extensions/api/serial/serial_api.h"
 #include "chrome/browser/extensions/api/serial/serial_connection.h"
 #include "chrome/browser/extensions/extension_apitest.h"
-#include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/ui/browser.h"
 #include "content/public/browser/browser_thread.h"
+#include "extensions/browser/extension_function.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using testing::_;

chrome/browser/extensions/api/socket/socket_api.h

@@ -9,8 +9,8 @@
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/extensions/api/api_function.h"
 #include "chrome/browser/extensions/api/api_resource_manager.h"
-#include "chrome/browser/extensions/extension_function.h"
 #include "chrome/common/extensions/api/socket.h"
+#include "extensions/browser/extension_function.h"
 #include "net/base/address_list.h"
 #include "net/dns/host_resolver.h"
 #include "net/socket/tcp_client_socket.h"

chrome/browser/extensions/api/streams_private/streams_private_api.h

@@ -11,11 +11,11 @@
 
 #include "base/values.h"
 #include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
-#include "chrome/browser/extensions/extension_function.h"
 #include "chrome/common/extensions/extension.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
+#include "extensions/browser/extension_function.h"
 
 class Profile;
 

chrome/browser/extensions/api/system_cpu/system_cpu_api.h

@@ -4,8 +4,8 @@
 #ifndef CHROME_BROWSER_EXTENSIONS_API_SYSTEM_CPU_SYSTEM_CPU_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_SYSTEM_CPU_SYSTEM_CPU_API_H_
 
-#include "chrome/browser/extensions/extension_function.h"
 #include "chrome/common/extensions/api/system_cpu.h"
+#include "extensions/browser/extension_function.h"
 
 namespace extensions {
 

chrome/browser/extensions/api/system_display/system_display_api.h

@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "chrome/browser/extensions/extension_function.h"
+#include "extensions/browser/extension_function.h"
 
 namespace extensions {
 

chrome/browser/extensions/api/system_indicator/system_indicator_api.h

@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_EXTENSIONS_API_SYSTEM_INDICATOR_SYSTEM_INDICATOR_API_H_
 
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
-#include "chrome/browser/extensions/extension_function.h"
+#include "extensions/browser/extension_function.h"
 
 class Profile;
 

chrome/browser/extensions/api/system_memory/system_memory_api.h

@@ -5,8 +5,8 @@
 #ifndef CHROME_BROWSER_EXTENSIONS_API_SYSTEM_MEMORY_SYSTEM_MEMORY_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_SYSTEM_MEMORY_SYSTEM_MEMORY_API_H_
 
-#include "chrome/browser/extensions/extension_function.h"
 #include "chrome/common/extensions/api/system_memory.h"
+#include "extensions/browser/extension_function.h"
 
 namespace extensions {
 

chrome/browser/extensions/api/system_storage/system_storage_api.h

@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_EXTENSIONS_API_SYSTEM_STORAGE_SYSTEM_STORAGE_API_H_
 
 #include "chrome/browser/extensions/api/system_storage/storage_info_provider.h"
-#include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/storage_monitor/storage_monitor.h"
+#include "extensions/browser/extension_function.h"
 
 namespace extensions {
 

chrome/browser/extensions/api/web_request/web_request_api.h

@@ -17,9 +17,9 @@
 #include "chrome/browser/extensions/api/declarative_webrequest/request_stage.h"
 #include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h"
 #include "chrome/browser/extensions/api/web_request/web_request_permissions.h"
-#include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_version_info.h"
+#include "extensions/browser/extension_function.h"
 #include "extensions/common/url_pattern_set.h"
 #include "ipc/ipc_sender.h"
 #include "net/base/completion_callback.h"

chrome/browser/extensions/chrome_extension_function.h

@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_EXTENSIONS_CHROME_EXTENSION_FUNCTION_H_
 #define CHROME_BROWSER_EXTENSIONS_CHROME_EXTENSION_FUNCTION_H_
 
-#include "chrome/browser/extensions/extension_function.h"
+#include "extensions/browser/extension_function.h"
 
 class Browser;
 class Profile;

chrome/browser/extensions/extension_function_dispatcher.h

@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/extensions/extension_function.h"
+#include "extensions/browser/extension_function.h"
 #include "ipc/ipc_sender.h"
 #include "url/gurl.h"
 

chrome/browser/extensions/extension_function_test_utils.cc

@@ -10,12 +10,12 @@
 #include "base/json/json_reader.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
-#include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "extensions/browser/extension_function.h"
 #include "extensions/common/id_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/renderer_host/pepper/pepper_extensions_common_message_filter.h

@@ -12,7 +12,7 @@
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
-#include "chrome/browser/extensions/extension_function.h"
+#include "extensions/browser/extension_function.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/host/resource_message_filter.h"
 #include "url/gurl.h"

chrome/browser/speech/extension_api/tts_engine_extension_api.h

@@ -8,8 +8,8 @@
 #include <vector>
 
 #include "base/memory/singleton.h"
-#include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/speech/tts_controller.h"
+#include "extensions/browser/extension_function.h"
 
 class Utterance;
 

chrome/browser/speech/tts_mac.mm

@@ -8,9 +8,9 @@
 #include "base/memory/singleton.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/speech/tts_controller.h"
 #include "chrome/browser/speech/tts_platform.h"
+#include "extensions/browser/extension_function.h"
 
 #import <Cocoa/Cocoa.h>
 

chrome/chrome_browser_extensions.gypi

@@ -685,8 +685,6 @@
         'browser/extensions/extension_error_ui.h',
         'browser/extensions/extension_error_ui_default.cc',
         'browser/extensions/extension_error_ui_default.h',
-        'browser/extensions/extension_function.cc',
-        'browser/extensions/extension_function.h',
         'browser/extensions/extension_function_dispatcher.cc',
         'browser/extensions/extension_function_dispatcher.h',
         'browser/extensions/extension_function_registry.cc',

extensions/browser/DEPS

@@ -9,13 +9,15 @@ include_rules = [
   # TODO(jamescook): Remove these. http://crbug.com/162530
   "+chrome/browser/chrome_notification_types.h",
   "+chrome/browser/extensions/api/runtime/runtime_api.h",
-  "+chrome/browser/extensions/extension_function.h",
+  "+chrome/browser/extensions/extension_function_dispatcher.h",
+  "+chrome/browser/extensions/extension_function_histogram_value.h",
   "+chrome/browser/extensions/extension_host.h",
   "+chrome/browser/extensions/extension_host_mac.h",
   "+chrome/browser/extensions/extension_service.h",
   "+chrome/browser/extensions/extension_system.h",
   "+chrome/browser/extensions/extension_util.h",
   "+chrome/browser/extensions/process_map.h",
+  "+chrome/browser/renderer_host/chrome_render_message_filter.h",
   "+chrome/common/extensions/extension.h",
   "+chrome/common/extensions/extension_messages.h",
   "+chrome/common/extensions/extension_set.h",

extensions/browser/extension_function.cc

@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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_function.h"
+#include "extensions/browser/extension_function.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"

extensions/browser/extension_function.h

@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
-#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_H_
-#define CHROME_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_H_
+#ifndef EXTENSIONS_BROWSER_EXTENSION_FUNCTION_H_
+#define EXTENSIONS_BROWSER_EXTENSION_FUNCTION_H_
 
 #include <list>
 #include <string>
@@ -432,4 +432,4 @@ class SyncIOThreadExtensionFunction : public IOThreadExtensionFunction {
   virtual ~SyncIOThreadExtensionFunction();
 };
 
-#endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_H_
+#endif  // EXTENSIONS_BROWSER_EXTENSION_FUNCTION_H_

extensions/browser/quota_service.cc

@@ -6,7 +6,7 @@
 
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
-#include "chrome/browser/extensions/extension_function.h"
+#include "extensions/browser/extension_function.h"
 #include "extensions/common/error_utils.h"
 
 namespace {

extensions/browser/quota_service_unittest.cc

@@ -6,8 +6,8 @@
 #include "base/process/process.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
-#include "chrome/browser/extensions/extension_function.h"
 #include "content/public/test/test_browser_thread.h"
+#include "extensions/browser/extension_function.h"
 #include "extensions/browser/quota_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

extensions/extensions.gyp

@@ -150,6 +150,8 @@
         'browser/extension_prefs_scope.h',
         'browser/extension_error.cc',
         'browser/extension_error.h',
+        'browser/extension_function.cc',
+        'browser/extension_function.h',
         'browser/extensions_browser_client.cc',
         'browser/extensions_browser_client.h',
         'browser/info_map.cc',