Move protocol_handler from chrome/browser to chrome/common so that extensions can use it.

BUG=86115
TEST=existing tests

Review URL: http://codereview.chromium.org/7275036

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

10 files changed, 12 insertions, 12 deletions

diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.cc b/chrome/browser/custom_handlers/protocol_handler_registry.cc
index bc20774..d7a10b8 100644
--- a/chrome/browser/custom_handlers/protocol_handler_registry.cc
+++ b/chrome/browser/custom_handlers/protocol_handler_registry.cc
@@ -10,13 +10,13 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util-inl.h"
-#include "chrome/browser/custom_handlers/protocol_handler.h"
 #include "chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/custom_handlers/protocol_handler.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/child_process_security_policy.h"
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.h b/chrome/browser/custom_handlers/protocol_handler_registry.h
index 391bd19..4b51af5 100644
--- a/chrome/browser/custom_handlers/protocol_handler_registry.h
+++ b/chrome/browser/custom_handlers/protocol_handler_registry.h
@@ -13,9 +13,9 @@
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/values.h"
-#include "chrome/browser/custom_handlers/protocol_handler.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/shell_integration.h"
+#include "chrome/common/custom_handlers/protocol_handler.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_service.h"
 #include "net/url_request/url_request.h"
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
index 93a7ba8..15319a6 100644
--- a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
+++ b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
@@ -11,8 +11,8 @@
 #include "base/scoped_ptr.h"
 #include "base/task.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/custom_handlers/protocol_handler.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/custom_handlers/protocol_handler.h"
 #include "chrome/test/testing_browser_process.h"
 #include "chrome/test/testing_browser_process_test.h"
 #include "chrome/test/testing_pref_service.h"
diff --git a/chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.h b/chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.h
index d194a86..c49ec69 100644
--- a/chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.h
+++ b/chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.h
@@ -7,8 +7,8 @@
 #pragma once
 
 #include "base/string16.h"
-#include "chrome/browser/custom_handlers/protocol_handler.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
+#include "chrome/common/custom_handlers/protocol_handler.h"
 
 class ProtocolHandlerRegistry;
 class TabContents;
diff --git a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc
index c34f832..3dfc4ba 100644
--- a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc
+++ b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc
@@ -11,7 +11,6 @@
 #include "chrome/browser/automation/automation_tab_helper.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
-#include "chrome/browser/custom_handlers/protocol_handler.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
@@ -49,6 +48,7 @@
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/custom_handlers/protocol_handler.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "content/browser/child_process_security_policy.h"
diff --git a/chrome/browser/ui/webui/options/handler_options_handler.h b/chrome/browser/ui/webui/options/handler_options_handler.h
index f7cb567..f0ab822 100644
--- a/chrome/browser/ui/webui/options/handler_options_handler.h
+++ b/chrome/browser/ui/webui/options/handler_options_handler.h
@@ -7,9 +7,9 @@
 
 #include <string>
 
-#include "chrome/browser/custom_handlers/protocol_handler.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
+#include "chrome/common/custom_handlers/protocol_handler.h"
 #include "content/common/notification_registrar.h"
 
 namespace base {
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 46a1309..83d9d6f 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -780,8 +780,6 @@
         'browser/crash_upload_list_win.h',
         'browser/custom_home_pages_table_model.cc',
         'browser/custom_home_pages_table_model.h',
-        'browser/custom_handlers/protocol_handler.cc',
-        'browser/custom_handlers/protocol_handler.h',
         'browser/custom_handlers/protocol_handler_registry.cc',
         'browser/custom_handlers/protocol_handler_registry.h',
         'browser/custom_handlers/register_protocol_handler_infobar_delegate.cc',
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 5520b94..6b4b9e3 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -155,6 +155,8 @@
         'common/common_message_generator.h',
         'common/common_param_traits.cc',
         'common/common_param_traits.h',
+        'common/custom_handlers/protocol_handler.cc',
+        'common/custom_handlers/protocol_handler.h',
         'common/default_plugin.cc',
         'common/default_plugin.h',
         'common/deprecated/event_sys-inl.h',
diff --git a/chrome/browser/custom_handlers/protocol_handler.cc b/chrome/common/custom_handlers/protocol_handler.cc
index a2a076d..92eb48b 100644
--- a/chrome/browser/custom_handlers/protocol_handler.cc
+++ b/chrome/common/custom_handlers/protocol_handler.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 "chrome/browser/custom_handlers/protocol_handler.h"
+#include "chrome/common/custom_handlers/protocol_handler.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
diff --git a/chrome/browser/custom_handlers/protocol_handler.h b/chrome/common/custom_handlers/protocol_handler.h
index 2798399..872ad17 100644
--- a/chrome/browser/custom_handlers/protocol_handler.h
+++ b/chrome/common/custom_handlers/protocol_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CUSTOM_HANDLERS_PROTOCOL_HANDLER_H_
-#define CHROME_BROWSER_CUSTOM_HANDLERS_PROTOCOL_HANDLER_H_
+#ifndef CHROME_COMMON_CUSTOM_HANDLERS_PROTOCOL_HANDLER_H_
+#define CHROME_COMMON_CUSTOM_HANDLERS_PROTOCOL_HANDLER_H_
 #pragma once
 
 #include <string>
@@ -60,4 +60,4 @@ class ProtocolHandler {
   string16 title_;
 };
 
-#endif  // CHROME_BROWSER_CUSTOM_HANDLERS_PROTOCOL_HANDLER_H_
+#endif  // CHROME_COMMON_CUSTOM_HANDLERS_PROTOCOL_HANDLER_H_