[uber page] Integrate history into uber page.

chrome/browser/ui/browser_navigator_browsertest.cc

 // Copyright (c) 2012 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/ui/browser_navigator_browsertest.h"
 
 #include "base/command_line.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
@@ skipping 1224 matching lines @@
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        NavigateFromDefaultToHistoryInSameTab) {
   {
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     browser()->ShowHistoryTab();
     observer.Wait();
   }
   EXPECT_EQ(1, browser()->tab_count());
-  EXPECT_EQ(GURL(chrome::kChromeUIHistoryURL),
+  // TODO(csilv): Update this for uber page. http://crbug.com/111579.
+  EXPECT_EQ(GURL(chrome::kChromeUIHistoryFrameURL),
             browser()->GetSelectedWebContents()->GetURL());
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        NavigateFromDefaultToBookmarksInSameTab) {
   {
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     browser()->OpenBookmarkManager();
@@ skipping 66 matching lines @@
   EXPECT_EQ(browser(), p2.browser);
 
   // We should now have two windows, the browser() provided by the framework and
   // the panel window we opened earlier. The tabbed browser window has 2 tabs.
   EXPECT_EQ(2u, BrowserList::size());
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, panel_browser->tab_count());
 }
 
 } // namespace