Prevent a crash when visiting about:hang in two NTPs.

chrome/browser/dom_ui/dom_ui_factory.cc

 // Copyright (c) 2010 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/dom_ui/dom_ui_factory.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/dom_ui/bookmarks_ui.h"
@@ skipping 216 matching lines @@
          url.SchemeIs(chrome::kChromeUIScheme) ||
          url.SchemeIs(chrome::kExtensionScheme);
 }
 
 // static
 bool DOMUIFactory::UseDOMUIForURL(Profile* profile, const GURL& url) {
   return GetDOMUIFactoryFunction(profile, url) != NULL;
 }
 
 // static
+bool DOMUIFactory::IsURLAcceptableForDOMUI(Profile* profile, const GURL& url) {
+  return UseDOMUIForURL(profile, url) ||
+         // javacsript: URLs are allowed to run in DOM UI pages

[brettw, 2010/11/15 00:04:32]

All this stuff should be indented only 4 spaces (6 from the left edge).

[Charlie Reis, 2010/11/15 17:49:27]

Done.

+         url.SchemeIs(chrome::kJavaScriptScheme) ||
+         // It's possible to load about:blank in a DOM UI renderer.
+         // See http://crbug.com/42547
+         url.spec() == chrome::kAboutBlankURL ||
+         // about:crash, about:hang, and about:shorthang are allowed.
+         url.spec() == chrome::kAboutCrashURL ||
+         url.spec() == chrome::kAboutHangURL ||
+         url.spec() == chrome::kAboutShorthangURL;
+}
+
+// static
 DOMUI* DOMUIFactory::CreateDOMUIForURL(TabContents* tab_contents,
                                        const GURL& url) {
   DOMUIFactoryFunction function = GetDOMUIFactoryFunction(
       tab_contents->profile(), url);
   if (!function)
     return NULL;
   return (*function)(tab_contents, url);
 }
 
 // static
@@ skipping 58 matching lines @@
   if (page_url.host() == chrome::kChromeUIPluginsHost)
     return PluginsUI::GetFaviconResourceBytes();
 
 #if defined(ENABLE_REMOTING)
   if (page_url.host() == chrome::kChromeUIRemotingHost)
     return RemotingUI::GetFaviconResourceBytes();
 #endif
 
   return NULL;
 }