Move url_constansts.h to content/public/common.

BUG=98716
Review URL: http://codereview.chromium.org/8276022

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

26 files changed, 29 insertions, 29 deletions

diff --git a/content/browser/browser_url_handler.cc b/content/browser/browser_url_handler.cc
index 65c176c8..d0ed4a2 100644
--- a/content/browser/browser_url_handler.cc
+++ b/content/browser/browser_url_handler.cc
@@ -7,7 +7,7 @@
 #include "base/string_util.h"
 #include "content/browser/content_browser_client.h"
 #include "content/browser/webui/web_ui.h"
-#include "content/common/url_constants.h"
+#include "content/public/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 
 // Handles rewriting view-source URLs for what we'll actually load.
diff --git a/content/browser/browsing_instance.cc b/content/browser/browsing_instance.cc
index 86c521a..f73ff56 100644
--- a/content/browser/browsing_instance.cc
+++ b/content/browser/browsing_instance.cc
@@ -11,8 +11,8 @@
 #include "content/browser/site_instance.h"
 #include "content/browser/webui/web_ui_factory.h"
 #include "content/common/content_client.h"
-#include "content/common/url_constants.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/url_constants.h"
 
 // static
 BrowsingInstance::ContextSiteInstanceMap
diff --git a/content/browser/child_process_security_policy.cc b/content/browser/child_process_security_policy.cc
index 0da4110..1433218 100644
--- a/content/browser/child_process_security_policy.cc
+++ b/content/browser/child_process_security_policy.cc
@@ -9,8 +9,8 @@
 #include "base/platform_file.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
-#include "content/common/url_constants.h"
 #include "content/public/common/bindings_policy.h"
+#include "content/public/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_request.h"
 
diff --git a/content/browser/child_process_security_policy_unittest.cc b/content/browser/child_process_security_policy_unittest.cc
index b1fc67b0..29c62d6 100644
--- a/content/browser/child_process_security_policy_unittest.cc
+++ b/content/browser/child_process_security_policy_unittest.cc
@@ -9,7 +9,7 @@
 #include "base/platform_file.h"
 #include "content/browser/child_process_security_policy.h"
 #include "content/common/test_url_constants.h"
-#include "content/common/url_constants.h"
+#include "content/public/common/url_constants.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_job.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/browser/download/save_package.cc b/content/browser/download/save_package.cc
index d03d55b..2574232 100644
--- a/content/browser/download/save_package.cc
+++ b/content/browser/download/save_package.cc
@@ -33,8 +33,8 @@
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/url_constants.h"
 #include "content/common/view_messages.h"
+#include "content/public/common/url_constants.h"
 #include "net/base/io_buffer.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_util.h"
diff --git a/content/browser/net/url_request_mock_http_job.cc b/content/browser/net/url_request_mock_http_job.cc
index 2691e2f..4b22301 100644
--- a/content/browser/net/url_request_mock_http_job.cc
+++ b/content/browser/net/url_request_mock_http_job.cc
@@ -9,7 +9,7 @@
 #include "base/string_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
-#include "content/common/url_constants.h"
+#include "content/public/common/url_constants.h"
 #include "net/base/net_util.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request_filter.h"
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
index de00cf1..0f81b6d 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -31,9 +31,9 @@
 #include "content/browser/user_metrics.h"
 #include "content/common/desktop_notification_messages.h"
 #include "content/common/notification_service.h"
-#include "content/common/url_constants.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/url_constants.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_platform_file.h"
 #include "media/audio/audio_util.h"
diff --git a/content/browser/renderer_host/render_view_host.cc b/content/browser/renderer_host/render_view_host.cc
index ff8d992..6a41de3 100644
--- a/content/browser/renderer_host/render_view_host.cc
+++ b/content/browser/renderer_host/render_view_host.cc
@@ -39,9 +39,9 @@
 #include "content/common/result_codes.h"
 #include "content/common/speech_input_messages.h"
 #include "content/common/swapped_out_messages.h"
-#include "content/common/url_constants.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/bindings_policy.h"
+#include "content/public/common/url_constants.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/content/browser/renderer_host/render_view_host_manager_browsertest.cc b/content/browser/renderer_host/render_view_host_manager_browsertest.cc
index 019e22d..e8e74ca 100644
--- a/content/browser/renderer_host/render_view_host_manager_browsertest.cc
+++ b/content/browser/renderer_host/render_view_host_manager_browsertest.cc
@@ -16,7 +16,7 @@
 #include "content/common/notification_details.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
-#include "content/common/url_constants.h"
+#include "content/public/common/url_constants.h"
 #include "net/base/net_util.h"
 #include "net/test/test_server.h"
 
diff --git a/content/browser/renderer_host/resource_dispatcher_host.cc b/content/browser/renderer_host/resource_dispatcher_host.cc
index 759273c..184a54a 100644
--- a/content/browser/renderer_host/resource_dispatcher_host.cc
+++ b/content/browser/renderer_host/resource_dispatcher_host.cc
@@ -54,9 +54,9 @@
 #include "content/browser/worker_host/worker_service.h"
 #include "content/common/notification_service.h"
 #include "content/common/resource_messages.h"
-#include "content/common/url_constants.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/url_constants.h"
 #include "net/base/auth.h"
 #include "net/base/cert_status_flags.h"
 #include "net/base/cookie_monster.h"
diff --git a/content/browser/renderer_host/resource_dispatcher_host_uitest.cc b/content/browser/renderer_host/resource_dispatcher_host_uitest.cc
index 19bb298..3c0c418 100644
--- a/content/browser/renderer_host/resource_dispatcher_host_uitest.cc
+++ b/content/browser/renderer_host/resource_dispatcher_host_uitest.cc
@@ -18,7 +18,7 @@
 #include "content/browser/net/url_request_failed_dns_job.h"
 #include "content/browser/net/url_request_mock_http_job.h"
 #include "content/common/test_url_constants.h"
-#include "content/common/url_constants.h"
+#include "content/public/common/url_constants.h"
 #include "net/base/net_util.h"
 #include "net/test/test_server.h"
 
diff --git a/content/browser/site_instance.cc b/content/browser/site_instance.cc
index 44a9f2e..ddc3a99 100644
--- a/content/browser/site_instance.cc
+++ b/content/browser/site_instance.cc
@@ -10,7 +10,7 @@
 #include "content/browser/webui/web_ui_factory.h"
 #include "content/common/content_client.h"
 #include "content/common/notification_service.h"
-#include "content/common/url_constants.h"
+#include "content/public/common/url_constants.h"
 #include "net/base/registry_controlled_domain.h"
 
 static bool IsURLSameAsAnySiteInstance(const GURL& url) {
diff --git a/content/browser/site_instance_unittest.cc b/content/browser/site_instance_unittest.cc
index 5c355dc..f2c0e19 100644
--- a/content/browser/site_instance_unittest.cc
+++ b/content/browser/site_instance_unittest.cc
@@ -18,7 +18,7 @@
 #include "content/browser/webui/empty_web_ui_factory.h"
 #include "content/common/content_client.h"
 #include "content/common/content_constants.h"
-#include "content/common/url_constants.h"
+#include "content/public/common/url_constants.h"
 #include "content/test/test_browser_context.h"
 #include "googleurl/src/url_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/browser/ssl/ssl_policy.cc b/content/browser/ssl/ssl_policy.cc
index 8f28f4b..4709434 100644
--- a/content/browser/ssl/ssl_policy.cc
+++ b/content/browser/ssl/ssl_policy.cc
@@ -18,7 +18,7 @@
 #include "content/browser/ssl/ssl_request_info.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/url_constants.h"
+#include "content/public/common/url_constants.h"
 #include "net/base/cert_status_flags.h"
 #include "net/base/ssl_info.h"
 #include "webkit/glue/resource_type.h"
diff --git a/content/browser/tab_contents/navigation_entry.cc b/content/browser/tab_contents/navigation_entry.cc
index 22f421c..843e95e 100644
--- a/content/browser/tab_contents/navigation_entry.cc
+++ b/content/browser/tab_contents/navigation_entry.cc
@@ -9,7 +9,7 @@
 #include "content/browser/content_browser_client.h"
 #include "content/browser/site_instance.h"
 #include "content/common/content_constants.h"
-#include "content/common/url_constants.h"
+#include "content/public/common/url_constants.h"
 #include "net/base/net_util.h"
 #include "ui/base/text/text_elider.h"
 
diff --git a/content/browser/tab_contents/render_view_host_manager.cc b/content/browser/tab_contents/render_view_host_manager.cc
index 044c742..652685e 100644
--- a/content/browser/tab_contents/render_view_host_manager.cc
+++ b/content/browser/tab_contents/render_view_host_manager.cc
@@ -20,9 +20,9 @@
 #include "content/common/content_client.h"
 #include "content/common/notification_service.h"
 #include "content/common/content_notification_types.h"
-#include "content/common/url_constants.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/url_constants.h"
 
 namespace base {
 class WaitableEvent;
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index 97cff18..3f1a786 100644
--- a/content/browser/tab_contents/tab_contents.cc
+++ b/content/browser/tab_contents/tab_contents.cc
@@ -45,9 +45,9 @@
 #include "content/common/intents_messages.h"
 #include "content/common/navigation_types.h"
 #include "content/common/notification_service.h"
-#include "content/common/url_constants.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/bindings_policy.h"
+#include "content/public/common/url_constants.h"
 #include "content/public/common/view_types.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_context_getter.h"
diff --git a/content/browser/tab_contents/tab_contents_delegate.cc b/content/browser/tab_contents/tab_contents_delegate.cc
index 293e7bb..a9849e2 100644
--- a/content/browser/tab_contents/tab_contents_delegate.cc
+++ b/content/browser/tab_contents/tab_contents_delegate.cc
@@ -9,7 +9,7 @@
 #include "base/memory/singleton.h"
 #include "content/browser/javascript_dialogs.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/url_constants.h"
+#include "content/public/common/url_constants.h"
 #include "ui/gfx/rect.h"
 #include "webkit/glue/web_intent_data.h"
 
diff --git a/content/common/test_url_constants.h b/content/common/test_url_constants.h
index 4c81bb0..565d3fe 100644
--- a/content/common/test_url_constants.h
+++ b/content/common/test_url_constants.h
@@ -8,7 +8,7 @@
 #define CONTENT_COMMON_TEST_URL_CONSTANTS_H_
 #pragma once
 
-#include "content/common/url_constants.h"
+#include "content/public/common/url_constants.h"
 
 namespace chrome {
 
diff --git a/content/content_common.gypi b/content/content_common.gypi
index a298a56..0889810 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -34,6 +34,8 @@
     'public/common/page_transition_types.cc',
     'public/common/page_transition_types.h',
     'public/common/resource_dispatcher_delegate.h',
+    'public/common/url_constants.cc',
+    'public/common/url_constants.h',
     'public/common/view_types.h',
     'common/appcache/appcache_backend_proxy.cc',
     'common/appcache/appcache_backend_proxy.h',
@@ -245,8 +247,6 @@
     'common/text_input_client_messages.h',
     'common/unix_domain_socket_posix.cc',
     'common/unix_domain_socket_posix.h',
-    'common/url_constants.cc',
-    'common/url_constants.h',
     'common/utility_messages.h',
     'common/view_messages.h',
     'common/view_message_enums.h',
diff --git a/content/plugin/webplugin_proxy.cc b/content/plugin/webplugin_proxy.cc
index 643d445..42dd084 100644
--- a/content/plugin/webplugin_proxy.cc
+++ b/content/plugin/webplugin_proxy.cc
@@ -14,9 +14,9 @@
 #include "content/common/npobject_proxy.h"
 #include "content/common/npobject_util.h"
 #include "content/common/plugin_messages.h"
-#include "content/common/url_constants.h"
 #include "content/plugin/plugin_channel.h"
 #include "content/plugin/plugin_thread.h"
+#include "content/public/common/url_constants.h"
 #include "skia/ext/platform_canvas.h"
 #include "skia/ext/platform_device.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
diff --git a/content/common/url_constants.cc b/content/public/common/url_constants.cc
index 442b52d..2c046d4 100644
--- a/content/common/url_constants.cc
+++ b/content/public/common/url_constants.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 "content/common/url_constants.h"
+#include "content/public/common/url_constants.h"
 
 #include "base/string_util.h"
 #include "googleurl/src/url_util.h"
diff --git a/content/common/url_constants.h b/content/public/common/url_constants.h
index f00460a..4b2362c 100644
--- a/content/common/url_constants.h
+++ b/content/public/common/url_constants.h
@@ -4,8 +4,8 @@
 
 // Contains constants for known URLs and portions thereof.
 
-#ifndef CONTENT_COMMON_URL_CONSTANTS_H_
-#define CONTENT_COMMON_URL_CONSTANTS_H_
+#ifndef CONTENT_PUBLIC_COMMON_URL_CONSTANTS_H_
+#define CONTENT_PUBLIC_COMMON_URL_CONSTANTS_H_
 #pragma once
 
 #include "content/common/content_export.h"
@@ -55,4 +55,4 @@ void CONTENT_EXPORT RegisterContentSchemes(
 
 }  // namespace chrome
 
-#endif  // CONTENT_COMMON_URL_CONSTANTS_H_
+#endif  // CONTENT_PUBLIC_COMMON_URL_CONSTANTS_H_
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index db78988..9e65677 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -38,10 +38,10 @@
 #include "content/common/quota_dispatcher.h"
 #include "content/common/renderer_preferences.h"
 #include "content/common/request_extra_data.h"
-#include "content/common/url_constants.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/bindings_policy.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/url_constants.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/public/renderer/navigation_state.h"
 #include "content/public/renderer/render_view_observer.h"
diff --git a/content/renderer/renderer_glue.cc b/content/renderer/renderer_glue.cc
index 373aae6..52a6a26 100644
--- a/content/renderer/renderer_glue.cc
+++ b/content/renderer/renderer_glue.cc
@@ -20,9 +20,9 @@
 #include "content/common/content_client.h"
 #include "content/common/npobject_util.h"
 #include "content/common/socket_stream_dispatcher.h"
-#include "content/common/url_constants.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/url_constants.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/renderer/render_thread_impl.h"
 #include "googleurl/src/url_util.h"
diff --git a/content/worker/test/worker_uitest.cc b/content/worker/test/worker_uitest.cc
index f24de11..355c287 100644
--- a/content/worker/test/worker_uitest.cc
+++ b/content/worker/test/worker_uitest.cc
@@ -14,7 +14,7 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "chrome/test/ui/ui_layout_test.h"
 #include "content/browser/worker_host/worker_service.h"
-#include "content/common/url_constants.h"
+#include "content/public/common/url_constants.h"
 #include "net/test/test_server.h"
 
 namespace {