Clean up some style and organization in the browser about handler. No code...

chrome/browser/tab_contents/tab_contents_factory.cc

 // Copyright (c) 2006-2008 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 "base/string_util.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/browser_url_handler.h"
 #include "chrome/browser/dom_ui/dom_ui_contents.h"
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/browser/profile.h"
@@ skipping 29 matching lines @@
 // static
 TabContents* TabContents::CreateWithType(TabContentsType type,
                                          Profile* profile,
                                          SiteInstance* instance) {
   TabContents* contents = NULL;
 
   switch (type) {
     case TAB_CONTENTS_WEB:
       contents = new WebContents(profile, instance, NULL, MSG_ROUTING_NONE, NULL);
       break;
-    case TAB_CONTENTS_ABOUT_UI:
-      contents = new BrowserAboutHandler(profile, instance, NULL);
-      break;
 // TODO(port): remove this platform define, either by porting the tab contents
 // types or removing them completely.
 #if defined(OS_WIN)
     case TAB_CONTENTS_HTML_DIALOG:
       contents = new HtmlDialogContents(profile, instance, NULL);
       break;
 #endif  // defined(OS_WIN)
     case TAB_CONTENTS_DEBUGGER:
     case TAB_CONTENTS_NEW_TAB_UI:
     case TAB_CONTENTS_DOM_UI:
@@ skipping 12 matching lines @@
   }
 
   if (contents)
     contents->CreateView();
 
   return contents;
 }
 
 // static
 TabContentsType TabContents::TypeForURL(GURL* url) {
+  // The BrowserURLHandler::HandleBrowserURL call should just be inside the
+  // NavigationController once this class is deleted.
   DCHECK(url);
   if (g_extra_types) {
     TabContentsFactoryMap::const_iterator it = g_extra_types->begin();
     for (; it != g_extra_types->end(); ++it) {
       if (it->second->CanHandleURL(*url))
         return it->first;
     }
   }
 
 // TODO(port): port the rest of this function.
 #if defined(OS_WIN)
   // Try to handle as a browser URL. If successful, |url| will end up
   // containing the real url being loaded (browser url's are just an alias).
   TabContentsType type(TAB_CONTENTS_UNKNOWN_TYPE);
   if (BrowserURLHandler::HandleBrowserURL(url, &type))
     return type;
 
   if (HtmlDialogContents::IsHtmlDialogUrl(*url))
     return TAB_CONTENTS_HTML_DIALOG;
 
   if (DebuggerContents::IsDebuggerUrl(*url))
     return TAB_CONTENTS_DEBUGGER;
 
   if (url->SchemeIs(DOMUIContents::GetScheme().c_str()))
     return TAB_CONTENTS_DOM_UI;
 #elif defined(OS_POSIX)
   TabContentsType type(TAB_CONTENTS_UNKNOWN_TYPE);
-  if (BrowserURLHandler::HandleBrowserURL(url, &type) &&
-      type == TAB_CONTENTS_ABOUT_UI) {
+  if (BrowserURLHandler::HandleBrowserURL(url, &type)) {
     return type;
   }
   if (url->SchemeIs(DOMUIContents::GetScheme().c_str()))
     return TAB_CONTENTS_DOM_UI;
   NOTIMPLEMENTED();
 #endif
 
   // NOTE: Even the empty string can be loaded by a WebContents.
   return TAB_CONTENTS_WEB;
 }
@@ skipping 15 matching lines @@
     g_extra_types->erase(type);
     if (g_extra_types->empty()) {
       delete g_extra_types;
       g_extra_types = NULL;
     }
   }
 
   return prev_factory;
 }