Revise about: and chrome: url handling.

chrome/browser/ui/webui/ntp/new_tab_ui_uitest.cc

 // Copyright (c) 2011 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/test/ui/ui_test.h"
 
 #include "base/test/test_timeouts.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/prefs/pref_value_store.h"
 #include "chrome/browser/sync/signin_manager.h"
@@ skipping 64 matching lines @@
 
   ASSERT_TRUE(tab->ExecuteAndExtractString(
       L"",
       L"window.domAutomationController.send("
       L"document.getElementById('login-username').innerText)",
       &displayed_username));
 
   EXPECT_EQ(L"user@gmail.com", displayed_username);
 }
 
-// Loads about:hang into two NTP tabs, ensuring we don't crash.
+// Loads chrome://hang/ into two NTP tabs, ensuring we don't crash.
 // See http://crbug.com/59859.
-TEST_F(NewTabUITest, AboutHangInNTP) {
+TEST_F(NewTabUITest, ChromeHangInNTP) {
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
 
   // Bring up a new tab page.
   ASSERT_TRUE(window->RunCommand(IDC_NEW_TAB));
   scoped_refptr<TabProxy> tab = window->GetActiveTab();
   ASSERT_TRUE(tab.get());
 
-  // Navigate to about:hang to stall the process.
-  ASSERT_TRUE(tab->NavigateToURLAsync(GURL(chrome::kAboutHangURL)));
+  // Navigate to chrome://hang/ to stall the process.
+  ASSERT_TRUE(tab->NavigateToURLAsync(GURL(chrome::kChromeUIHangURL)));
 
-  // Visit about:hang again in another NTP.  Don't bother waiting for the
+  // Visit chrome://hang/ again in another NTP. Don't bother waiting for the
   // NTP to load, because it's hung.
   ASSERT_TRUE(window->RunCommandAsync(IDC_NEW_TAB));
   scoped_refptr<TabProxy> tab2 = window->GetActiveTab();
   ASSERT_TRUE(tab2.get());
-  ASSERT_TRUE(tab2->NavigateToURLAsync(GURL(chrome::kAboutHangURL)));
+  ASSERT_TRUE(tab2->NavigateToURLAsync(GURL(chrome::kChromeUIHangURL)));
 }
 
 // Allows testing NTP in process-per-tab mode.
 class NewTabUIProcessPerTabTest : public NewTabUITest {
  public:
   NewTabUIProcessPerTabTest() : NewTabUITest() {}
 
  protected:
   virtual void SetUp() {
     launch_arguments_.AppendSwitch(switches::kProcessPerTab);
     UITest::SetUp();
   }
 };
 
 // Navigates away from NTP before it commits, in process-per-tab mode.
 // Ensures that we don't load the normal page in the NTP process (and thus
 // crash), as in http://crbug.com/69224.
 TEST_F(NewTabUIProcessPerTabTest, NavBeforeNTPCommits) {
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
 
   // Bring up a new tab page.
   ASSERT_TRUE(window->RunCommand(IDC_NEW_TAB));
   scoped_refptr<TabProxy> tab = window->GetActiveTab();
   ASSERT_TRUE(tab.get());
 
-  // Navigate to about:hang to stall the process.
-  ASSERT_TRUE(tab->NavigateToURLAsync(GURL(chrome::kAboutHangURL)));
+  // Navigate to chrome://hang/ to stall the process.
+  ASSERT_TRUE(tab->NavigateToURLAsync(GURL(chrome::kChromeUIHangURL)));
 
   // Visit a normal URL in another NTP that hasn't committed.
   ASSERT_TRUE(window->RunCommandAsync(IDC_NEW_TAB));
   scoped_refptr<TabProxy> tab2 = window->GetActiveTab();
   ASSERT_TRUE(tab2.get());
   ASSERT_TRUE(tab2->NavigateToURL(GURL("data:text/html,hello world")));
 }
 
 // Fails about ~5% of the time on all platforms. http://crbug.com/45001
 TEST_F(NewTabUITest, FLAKY_ChromeInternalLoadsNTP) {
@@ skipping 31 matching lines @@
   ASSERT_EQ(0, prefs->GetInteger(prefs::kNTPPrefVersion));
 
   bool migrated = NewTabUI::UpdateUserPrefsVersion(prefs.get());
   ASSERT_TRUE(migrated);
   ASSERT_EQ(NewTabUI::current_pref_version(),
             prefs->GetInteger(prefs::kNTPPrefVersion));
 
   migrated = NewTabUI::UpdateUserPrefsVersion(prefs.get());
   ASSERT_FALSE(migrated);
 }