Make TabContents ctor private; poke hole for existing callers.

chrome/browser/ui/tabs/tab_strip_model_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/ui/tabs/tab_strip_model.h"
 
 #include <map>
 #include <string>
 
 #include "base/file_path.h"
@@ skipping 30 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 using content::NavigationController;
 using content::SiteInstance;
 using content::WebContents;
 using extensions::Extension;
 
+// TODO(avi): Kill this when TabContents goes away.
+class TabStripModelContentsCreator {
+ public:
+  static TabContents* CreateTabContents(content::WebContents* contents) {
+    return TabContents::Factory::CreateTabContents(contents);
+  }
+};
+
 namespace {
 
 // Class used to delete a TabContents when another TabContents is destroyed.
 class DeleteTabContentsOnDestroyedObserver
     : public content::NotificationObserver {
  public:
   DeleteTabContentsOnDestroyedObserver(TabContents* source,
                                        TabContents* tab_to_delete)
       : source_(source),
         tab_to_delete_(tab_to_delete) {
@@ skipping 1398 matching lines @@
   EXPECT_EQ(1, tabstrip.count());
 
   tabstrip.CloseAllTabs();
   EXPECT_TRUE(tabstrip.empty());
 }
 
 // Added for http://b/issue?id=958960
 TEST_F(TabStripModelTest, AppendContentsReselectionTest) {
   WebContents* fake_destinations_tab =
       WebContents::Create(profile(), NULL, MSG_ROUTING_NONE, NULL);
-  TabContents tab_contents(fake_destinations_tab);
-  TabStripDummyDelegate delegate(&tab_contents);
+  scoped_ptr<TabContents> tab_contents(
+      TabStripModelContentsCreator::CreateTabContents(fake_destinations_tab));
+  TabStripDummyDelegate delegate(tab_contents.get());
   TabStripModel tabstrip(&delegate, profile());
   EXPECT_TRUE(tabstrip.empty());
 
   // Open the Home Page
   TabContents* homepage_contents = CreateTabContents();
   tabstrip.AddTabContents(
       homepage_contents, -1, content::PAGE_TRANSITION_AUTO_BOOKMARK,
       TabStripModel::ADD_ACTIVE);
 
   // Open some other tab, by user typing.
@@ skipping 946 matching lines @@
   ASSERT_EQ(1, observer.GetStateCount());
   MockTabStripModelObserver::State s(
       contents2, 1, MockTabStripModelObserver::SELECT);
   s.src_contents = contents2;
   s.src_index = 1;
   s.user_gesture = false;
   EXPECT_TRUE(observer.StateEquals(0, s));
   strip.RemoveObserver(&observer);
   strip.CloseAllTabs();
 }