Get rid of RenderViewHostDelegate::BrowserIntegration since it was unnecessar...

chrome/browser/tab_contents/navigation_controller_unittest.cc

 // Copyright (c) 2010 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/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 13 matching lines @@
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
 #include "chrome/test/test_notification_tracker.h"
 #include "chrome/test/testing_profile.h"
 #include "net/base/net_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/webkit_glue.h"
 
 using base::Time;
 
-namespace {
-
 // NavigationControllerTest ----------------------------------------------------
 
 class NavigationControllerTest : public RenderViewHostTestHarness {
  public:
   NavigationControllerTest() {}
 };
 
 // NavigationControllerHistoryTest ---------------------------------------------
 
 class NavigationControllerHistoryTest : public NavigationControllerTest {
@@ skipping 1771 matching lines @@
   const GURL url1("http://foo1");
   const GURL url2("http://foo2");
   const GURL url3("http://foo3");
 
   NavigateAndCommit(url1);
   NavigateAndCommit(url2);
   NavigateAndCommit(url3);
   controller().GoBack();
   contents()->CommitPendingNavigation();
 
-  // Casts the TabContents to a RenderViewHostDelegate::BrowserIntegration so we
-  // can call GoToEntryAtOffset which is private.
-  RenderViewHostDelegate::BrowserIntegration* rvh_delegate =
-      static_cast<RenderViewHostDelegate::BrowserIntegration*>(contents());
-
   // Simulate the page calling history.back(), it should not create a pending
   // entry.
-  rvh_delegate->GoToEntryAtOffset(-1);
+  contents()->OnGoToEntryAtOffset(-1);
   EXPECT_EQ(-1, controller().pending_entry_index());
   // The actual cross-navigation is suspended until the current RVH tells us
   // it unloaded, simulate that.
   contents()->ProceedWithCrossSiteNavigation();
   // Also make sure we told the page to navigate.
   const IPC::Message* message =
       process()->sink().GetFirstMessageMatching(ViewMsg_Navigate::ID);
   ASSERT_TRUE(message != NULL);
   Tuple1<ViewMsg_Navigate_Params> nav_params;
   ViewMsg_Navigate::Read(message, &nav_params);
   EXPECT_EQ(url1, nav_params.a.url);
   process()->sink().ClearMessages();
 
   // Now test history.forward()
-  rvh_delegate->GoToEntryAtOffset(1);
+  contents()->OnGoToEntryAtOffset(1);
   EXPECT_EQ(-1, controller().pending_entry_index());
   // The actual cross-navigation is suspended until the current RVH tells us
   // it unloaded, simulate that.
   contents()->ProceedWithCrossSiteNavigation();
   message = process()->sink().GetFirstMessageMatching(ViewMsg_Navigate::ID);
   ASSERT_TRUE(message != NULL);
   ViewMsg_Navigate::Read(message, &nav_params);
   EXPECT_EQ(url3, nav_params.a.url);
   process()->sink().ClearMessages();
 
   // Make sure an extravagant history.go() doesn't break.
-  rvh_delegate->GoToEntryAtOffset(120);  // Out of bounds.
+  contents()->OnGoToEntryAtOffset(120);  // Out of bounds.
   EXPECT_EQ(-1, controller().pending_entry_index());
   message = process()->sink().GetFirstMessageMatching(ViewMsg_Navigate::ID);
   EXPECT_TRUE(message == NULL);
 }
 
 // Test call to PruneAllButActive for the only entry.
 TEST_F(NavigationControllerTest, PruneAllButActiveForSingle) {
   const GURL url1("http://foo1");
   NavigateAndCommit(url1);
   controller().PruneAllButActive();
@@ skipping 151 matching lines @@
   TabNavigation nav(0, url0, GURL(), string16(),
                     webkit_glue::CreateHistoryStateForURL(url0),
                     PageTransition::LINK);
   session_helper_.AssertNavigationEquals(nav,
                                          windows_[0]->tabs[0]->navigations[0]);
   nav.set_url(url2);
   session_helper_.AssertNavigationEquals(nav,
                                          windows_[0]->tabs[0]->navigations[1]);
 }
 */
-
-}  // namespace