Revise about: and chrome: url handling.

chrome/browser/tab_restore_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 "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/test/test_timeouts.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 584 matching lines @@
   EXPECT_TRUE(url == url1_);
 
   restored_tab_proxy = browser_proxy->GetTab(initial_tab_count + 1);
   ASSERT_TRUE(restored_tab_proxy.get());
   ASSERT_TRUE(restored_tab_proxy->WaitForTabToBeRestored(
       TestTimeouts::action_timeout_ms()));
   ASSERT_TRUE(restored_tab_proxy->GetCurrentURL(&url));
   EXPECT_TRUE(url == url2_);
 }
 
-// Restore tab with special URL about:credits and make sure the page loads
+// Restore tab with special URL chrome://credits/ and make sure the page loads
 // properly after restore. See http://crbug.com/31905.
 TEST_F(TabRestoreUITest, RestoreTabWithSpecialURL) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   CheckActiveWindow(browser.get());
 
   // Navigate new tab to a special URL.
-  const GURL special_url(chrome::kAboutCreditsURL);
+  const GURL special_url(chrome::kChromeUICreditsURL);
   ASSERT_TRUE(browser->AppendTab(special_url));
   scoped_refptr<TabProxy> tab(browser->GetActiveTab());
   ASSERT_TRUE(tab.get());
 
   // Close the tab.
   ASSERT_TRUE(tab->Close(true));
 
   // Restore the closed tab.
   RestoreTab(0, 1);
   tab = browser->GetTab(1);
@@ skipping 12 matching lines @@
                               FilePath(FILE_PATH_LITERAL("chrome/test/data")));
   ASSERT_TRUE(test_server.Start());
 
   const GURL http_url(test_server.GetURL("files/title1.html"));
 
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   CheckActiveWindow(browser.get());
 
   // Navigate new tab to a special URL.
-  const GURL special_url(chrome::kAboutCreditsURL);
+  const GURL special_url(chrome::kChromeUICreditsURL);
   ASSERT_TRUE(browser->AppendTab(special_url));
   scoped_refptr<TabProxy> tab(browser->GetActiveTab());
   ASSERT_TRUE(tab.get());
 
   // Then navigate to a normal URL.
   ASSERT_TRUE(tab->NavigateToURL(http_url));
 
   // Close the tab.
   ASSERT_TRUE(tab->Close(true));
 
   // Restore the closed tab.
   RestoreTab(0, 1);
   tab = browser->GetTab(1);
   ASSERT_TRUE(tab.get());
   ASSERT_TRUE(tab->WaitForTabToBeRestored(TestTimeouts::action_timeout_ms()));
   GURL url;
   ASSERT_TRUE(tab->GetCurrentURL(&url));
   ASSERT_EQ(http_url, url);
 
   // Go back, and see if content is as expected.
   ASSERT_TRUE(tab->GoBack());
   EXPECT_TRUE(tab->FindInPage(std::wstring(L"webkit"), FWD, IGNORE_CASE, false,
                               NULL));
 }