Add abstractions that let embedders drive tests of WebContents.

chrome/browser/sessions/tab_restore_service_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 "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/chrome_render_view_test.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "content/browser/tab_contents/test_tab_contents.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/test/render_view_test.h"
+#include "content/test/web_contents_tester.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 
 typedef TabRestoreService::Tab Tab;
 typedef TabRestoreService::Window Window;
+using content::WebContentsTester;
 
 using content::NavigationEntry;
 
 // Create subclass that overrides TimeNow so that we can control the time used
 // for closed tabs and windows.
 class TabRestoreTimeFactory : public TabRestoreService::TimeFactory {
  public:
   TabRestoreTimeFactory() : time_(base::Time::Now()) {}
 
   virtual ~TabRestoreTimeFactory() {}
@@ skipping 38 matching lines @@
     // Navigate to three URLs.
     NavigateAndCommit(url1_);
     NavigateAndCommit(url2_);
     NavigateAndCommit(url3_);
   }
 
   void NavigateToIndex(int index) {
     // Navigate back. We have to do this song and dance as NavigationController
     // isn't happy if you navigate immediately while going back.
     controller().GoToIndex(index);
-    contents()->CommitPendingNavigation();
+    WebContentsTester::For(contents())->CommitPendingNavigation();
   }
 
   void RecreateService() {
     // Must set service to null first so that it is destroyed before the new
     // one is created.
     service_->Shutdown();
     service_.reset();
     service_.reset(new TabRestoreService(profile(), time_factory_));
     service_->LoadTabsFromLastSession();
   }
@@ skipping 539 matching lines @@
   for (size_t i = 0; i < max_entries + 5; i++) {
     NavigateAndCommit(GURL(StringPrintf("http://%d", static_cast<int>(i))));
     service_->CreateHistoricalTab(&controller(), -1);
   }
 
   EXPECT_EQ(max_entries, service_->entries_.size());
   // This should not crash.
   service_->LoadTabsFromLastSession();
   EXPECT_EQ(max_entries, service_->entries_.size());
 }