Revert brett's code, for real this time.

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

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

5 files changed, 31 insertions, 43 deletions

diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index 52c8605..3754dab 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -1,32 +1,27 @@
-// 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 "chrome/common/url_constants.h"

-

-namespace chrome {

-

-const char kAboutScheme[] = "about";

-const char kChromeInternalScheme[] = "chrome-internal";

-const char kChromeUIScheme[] = "chrome-ui";

-const char kDataScheme[] = "data";

+// 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 "chrome/common/url_constants.h"
+
+namespace chrome {
+
+const char kAboutScheme[] = "about";
+const char kChromeInternalScheme[] = "chrome-internal";
+const char kChromeUIScheme[] = "chrome-ui";
+const char kDataScheme[] = "data";
 const char kExtensionScheme[] = "chrome-extension";
-const char kFileScheme[] = "file";

-const char kFtpScheme[] = "ftp";

-const char kHttpScheme[] = "http";

-const char kHttpsScheme[] = "https";

-const char kJavaScriptScheme[] = "javascript";

+const char kFileScheme[] = "file";
+const char kFtpScheme[] = "ftp";
+const char kHttpScheme[] = "http";
+const char kHttpsScheme[] = "https";
+const char kJavaScriptScheme[] = "javascript";
 const char kMailToScheme[] = "mailto";
 const char kUserScriptScheme[] = "chrome-user-script";
-const char kViewSourceScheme[] = "view-source";

-

-const char kStandardSchemeSeparator[] = "://";

-

-const char kAboutBlankURL[] = "about:blank";

-const char kAboutCacheURL[] = "about:cache";

-const char kAboutCrashURL[] = "about:crash";

-const char kAboutHangURL[] = "about:hang";

-const char kAboutMemoryURL[] = "about:memory";

-const char kAboutShortHangURL[] = "about:shorthang";

-

-}  // namespace chrome

+const char kViewSourceScheme[] = "view-source";
+
+const char kStandardSchemeSeparator[] = "://";
+
+const char kAboutBlankURL[] = "about:blank";
+
+}  // namespace chrome
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index d7cc15e..1cbf97b 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -29,11 +29,6 @@ extern const char kStandardSchemeSeparator[];
 

 // About URLs (including schmes).

 extern const char kAboutBlankURL[];

-extern const char kAboutCacheURL[];

-extern const char kAboutCrashURL[];

-extern const char kAboutHangURL[];

-extern const char kAboutMemoryURL[];

-extern const char kAboutShortHangURL[];

 

 }  // namespace chrome

 

diff --git a/chrome/renderer/about_handler.cc b/chrome/renderer/about_handler.cc
index d0fb504..ff26d85 100644
--- a/chrome/renderer/about_handler.cc
+++ b/chrome/renderer/about_handler.cc
@@ -5,7 +5,6 @@
 #include "chrome/renderer/about_handler.h"
 
 #include "base/platform_thread.h"
-#include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 
 struct AboutHandlerUrl {
@@ -14,14 +13,14 @@ struct AboutHandlerUrl {
 };
 
 static AboutHandlerUrl about_urls[] = {
-  { chrome::kAboutCrashURL, AboutHandler::AboutCrash },
-  { chrome::kAboutHangURL, AboutHandler::AboutHang },
-  { chrome::kAboutShortHangURL, AboutHandler::AboutShortHang },
+  { "about:crash", AboutHandler::AboutCrash },
+  { "about:hang", AboutHandler::AboutHang },
+  { "about:shorthang", AboutHandler::AboutShortHang },
   { NULL, NULL }
 };
 
 bool AboutHandler::WillHandle(const GURL& url) {
-  if (url.SchemeIs(chrome::kAboutScheme))
+  if (url.scheme() != "about")
     return false;
 
   struct AboutHandlerUrl* url_handler = about_urls;
@@ -35,7 +34,7 @@ bool AboutHandler::WillHandle(const GURL& url) {
 
 // static
 bool AboutHandler::MaybeHandle(const GURL& url) {
-  if (!url.SchemeIs(chrome::kAboutScheme))
+  if (url.scheme() != "about")
     return false;
 
   struct AboutHandlerUrl* url_handler = about_urls;
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index a4351fb..91efbf4 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -1607,7 +1607,7 @@ WindowOpenDisposition RenderView::DispositionForNavigationAction(
   // JavaScript.
   bool is_fork =
       // Must start from a tab showing about:blank, which is later redirected.
-      frame->GetURL() == GURL(chrome::kAboutBlankURL) &&
+      frame->GetURL() == GURL("about:blank") &&
       // Must be the first real navigation of the tab.
       GetHistoryBackListCount() < 1 &&
       GetHistoryForwardListCount() < 1 &&
diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.cc b/chrome/test/automated_ui_tests/automated_ui_tests.cc
index 9baa7e2..d87d521 100644
--- a/chrome/test/automated_ui_tests/automated_ui_tests.cc
+++ b/chrome/test/automated_ui_tests/automated_ui_tests.cc
@@ -18,7 +18,6 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/common/libxml_utils.h"
-#include "chrome/common/url_constants.h"
 #include "chrome/common/win_util.h"
 #include "chrome/test/automated_ui_tests/automated_ui_tests.h"
 #include "chrome/test/automation/browser_proxy.h"
@@ -739,7 +738,7 @@ bool AutomatedUITest::ForceCrash() {
     return false;
   }
   scoped_ptr<TabProxy> tab(browser->GetActiveTab());
-  GURL test_url(chrome::kAboutCrashURL);
+  GURL test_url("about:crash");
   bool did_timeout;
   tab->NavigateToURLWithTimeout(test_url, kDebuggingTimeoutMsec, &did_timeout);
   if (!did_timeout) {