Make TabContents ctor private; poke hole for existing callers.

chrome/browser/ui/webui/web_ui_unittest.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/favicon/favicon_tab_helper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tab_contents/test_tab_contents.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/referrer.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_renderer_host.h"
 #include "content/public/test/web_contents_tester.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 using content::NavigationController;
 using content::RenderViewHost;
 using content::RenderViewHostTester;
 using content::SiteInstance;
 using content::WebContents;
 using content::WebContentsTester;
 
+// TODO(avi): Kill this when TabContents goes away.
+class WebUITestContentsCreator {
+ public:
+  static TabContents* CreateTabContents(content::WebContents* contents) {
+    return TabContents::Factory::CreateTabContents(contents);
+  }
+};
+
 class WebUITest : public TabContentsTestHarness {
  public:
   WebUITest() : ui_thread_(BrowserThread::UI, MessageLoop::current()) {}
 
   // Tests navigating with a Web UI from a fresh (nothing pending or committed)
   // state, through pending, committed, then another navigation. The first page
   // ID that we should use is passed as a parameter. We'll use the next two
   // values. This must be increasing for the life of the tests.
   static void DoNavigationTest(TabContents* tab_contents, int page_id) {
     WebContents* contents = tab_contents->web_contents();
@@ skipping 63 matching lines @@
 // non-DOM-UI page.
 TEST_F(WebUITest, WebUIToStandard) {
   DoNavigationTest(tab_contents(), 1);
 
   // Test the case where we're not doing the initial navigation. This is
   // slightly different than the very-first-navigation case since the
   // SiteInstance will be the same (the original WebContents must still be
   // alive), which will trigger different behavior in RenderViewHostManager.
   WebContents* contents2 =
       WebContentsTester::CreateTestWebContents(profile(), NULL);
-  TabContents tab_contents2(contents2);
+  scoped_ptr<TabContents> tab_contents2(
+      WebUITestContentsCreator::CreateTabContents(contents2));
 
-  DoNavigationTest(&tab_contents2, 101);
+  DoNavigationTest(tab_contents2.get(), 101);
 }
 
 TEST_F(WebUITest, WebUIToWebUI) {
   // Do a load (this state is tested above).
   GURL new_tab_url(chrome::kChromeUINewTabURL);
   controller().LoadURL(new_tab_url, content::Referrer(),
                        content::PAGE_TRANSITION_LINK,
                        std::string());
   rvh_tester()->SendNavigate(1, new_tab_url);
 
@@ skipping 80 matching lines @@
   focus_called = wct->GetNumberOfFocusCalls();
   ASSERT_TRUE(controller().CanGoForward());
   controller().GoForward();
   old_rvh = rvh();
   RenderViewHostTester::For(old_rvh)->SendShouldCloseACK(true);
   RenderViewHostTester::For(
       pending_rvh())->SendNavigate(next_page_id, next_url);
   RenderViewHostTester::For(old_rvh)->SimulateSwapOutACK();
   EXPECT_EQ(focus_called, wct->GetNumberOfFocusCalls());
 }