Remove some obsolete urls. I found these when looking at all the entries in ChromeURLContentSecurityPolicyExceptionSet and trying to match them to a content::URLDataSource.

chrome://collected-cookies webui was removed in r124241

chrome://input-window-dialog webui was removed in r122290

chrome://http-auth/ was removed in r126979

chrome://dialog isn't used anywhere

Also remove chrome://cloudprintresources from ChromeURLContentSecurityPolicyExceptionSet. I'm not sure why it's there, but that hostname doesn't go through URLRequestChromeJob when using cloud print.

BUG=169170
Review URL: https://codereview.chromium.org/12047009

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

4 files changed, 1 insertions, 24 deletions

diff --git a/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc b/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc
index 25608d2..2b1357e 100644
--- a/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc
+++ b/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc
@@ -58,11 +58,8 @@ class ChromeURLContentSecurityPolicyExceptionSet
  public:
   ChromeURLContentSecurityPolicyExceptionSet() : std::set<std::string>() {
     // TODO(tsepez) whittle this list down to nothing.
-    insert(chrome::kChromeUICloudPrintResourcesHost);
     insert(chrome::kChromeUICloudPrintSetupHost);
     insert(chrome::kChromeUIDevToolsHost);
-    insert(chrome::kChromeUIDialogHost);
-    insert(chrome::kChromeUIInputWindowDialogHost);
     insert(chrome::kChromeUINewTabHost);
 #if defined(OS_CHROMEOS)
     insert(chrome::kChromeUIMobileSetupHost);
@@ -74,8 +71,6 @@ class ChromeURLContentSecurityPolicyExceptionSet
     insert(chrome::kChromeUISystemInfoHost);
 #endif
 #if defined(OS_CHROMEOS) || defined(USE_AURA)
-    insert(chrome::kChromeUICollectedCookiesHost);
-    insert(chrome::kChromeUIHttpAuthHost);
     insert(chrome::kChromeUITabModalConfirmDialogHost);
 #endif
   }
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index 7d68785..3cbd2b6 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -256,8 +256,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
   // Downloads list on Android uses the built-in download manager.
   if (url.host() == chrome::kChromeUIDownloadsHost)
     return &NewWebUI<DownloadsUI>;
-  if (url.host() == chrome::kChromeUIDialogHost)
-    return &NewWebUI<ConstrainedWebDialogUI>;
   // Feedback on Android uses the built-in feedback app.
   if (url.host() == chrome::kChromeUIFeedbackHost)
     return &NewWebUI<FeedbackUI>;
@@ -342,9 +340,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
 #endif  // defined(USE_AURA)
 
 #if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
-  if (url.host() == chrome::kChromeUICollectedCookiesHost ||
-      url.host() == chrome::kChromeUIHttpAuthHost ||
-      url.host() == chrome::kChromeUITabModalConfirmDialogHost) {
+  if (url.host() == chrome::kChromeUITabModalConfirmDialogHost) {
     return &NewWebUI<ConstrainedWebDialogUI>;
   }
 #endif
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index 4d6f93b..a5ed8a9 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -43,7 +43,6 @@ const char kChromeUIFlashURL[] = "chrome://flash/";
 const char kChromeUIHelpFrameURL[] = "chrome://help-frame/";
 const char kChromeUIHistoryURL[] = "chrome://history/";
 const char kChromeUIHistoryFrameURL[] = "chrome://history-frame/";
-const char kChromeUIInputWindowDialogURL[] = "chrome://input-window-dialog/";
 const char kChromeUIInspectURL[] = "chrome://inspect/";
 const char kChromeUIInstantURL[] = "chrome://instant/";
 const char kChromeUIIPCURL[] = "chrome://ipc/";
@@ -117,8 +116,6 @@ const char kChromeUIGestureConfigHost[] = "gesture";
 #endif
 
 #if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
-const char kChromeUICollectedCookiesURL[] = "chrome://collected-cookies/";
-const char kChromeUIHttpAuthURL[] = "chrome://http-auth/";
 const char kChromeUITabModalConfirmDialogURL[] =
     "chrome://tab-modal-confirm-dialog/";
 #endif
@@ -141,7 +138,6 @@ const char kChromeUICrashHost[] = "crash";
 const char kChromeUICreditsHost[] = "credits";
 const char kChromeUIDefaultHost[] = "version";
 const char kChromeUIDevToolsHost[] = "devtools";
-const char kChromeUIDialogHost[] = "dialog";
 const char kChromeUIDNSHost[] = "dns";
 const char kChromeUIDownloadsHost[] = "downloads";
 const char kChromeUIDriveInternalsHost[] = "drive-internals";
@@ -162,7 +158,6 @@ const char kChromeUIHelpFrameHost[] = "help-frame";
 const char kChromeUIHelpHost[] = "help";
 const char kChromeUIHistoryHost[] = "history";
 const char kChromeUIHistoryFrameHost[] = "history-frame";
-const char kChromeUIInputWindowDialogHost[] = "input-window-dialog";
 const char kChromeUIInspectHost[] = "inspect";
 const char kChromeUIInstantHost[] = "instant";
 const char kChromeUIIPCHost[] = "ipc";
@@ -265,8 +260,6 @@ const char kChromeUIFileManagerHost[] = "files";
 #endif
 
 #if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
-const char kChromeUICollectedCookiesHost[] = "collected-cookies";
-const char kChromeUIHttpAuthHost[] = "http-auth";
 const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog";
 #endif
 
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index e57ad72..d877e9d 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -42,7 +42,6 @@ extern const char kChromeUIFlashURL[];
 extern const char kChromeUIHelpFrameURL[];
 extern const char kChromeUIHistoryURL[];
 extern const char kChromeUIHistoryFrameURL[];
-extern const char kChromeUIInputWindowDialogURL[];
 extern const char kChromeUIInspectURL[];
 extern const char kChromeUIInstantURL[];
 extern const char kChromeUIIPCURL[];
@@ -114,8 +113,6 @@ extern const char kChromeUIGestureConfigHost[];
 #endif
 
 #if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
-extern const char kChromeUICollectedCookiesURL[];
-extern const char kChromeUIHttpAuthURL[];
 extern const char kChromeUITabModalConfirmDialogURL[];
 #endif
 
@@ -136,7 +133,6 @@ extern const char kChromeUICrashHost[];
 extern const char kChromeUICreditsHost[];
 extern const char kChromeUIDefaultHost[];
 extern const char kChromeUIDevToolsHost[];
-extern const char kChromeUIDialogHost[];
 extern const char kChromeUIDNSHost[];
 extern const char kChromeUIDownloadsHost[];
 extern const char kChromeUIDriveInternalsHost[];
@@ -157,7 +153,6 @@ extern const char kChromeUIGpuInternalsHost[];
 extern const char kChromeUIHangHost[];
 extern const char kChromeUIHistoryHost[];
 extern const char kChromeUIHistoryFrameHost[];
-extern const char kChromeUIInputWindowDialogHost[];
 extern const char kChromeUIInspectHost[];
 extern const char kChromeUIInstantHost[];
 extern const char kChromeUIIPCHost[];
@@ -260,8 +255,6 @@ extern const char kChromeUIFileManagerHost[];
 #endif
 
 #if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
-extern const char kChromeUICollectedCookiesHost[];
-extern const char kChromeUIHttpAuthHost[];
 extern const char kChromeUITabModalConfirmDialogHost[];
 #endif