Make TabContents ctor private; poke hole for existing callers.

chrome/browser/ui/browser_tabstrip.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_tabstrip.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 
+// TODO(avi): Kill this when TabContents goes away.
+class BrowserTabstripTabContentsCreator {
+ public:
+  static TabContents* CreateTabContents(content::WebContents* contents) {
+    return TabContents::Factory::CreateTabContents(contents);
+  }
+};
+
 namespace chrome {
 
 int GetIndexOfTab(const Browser* browser,
                   const content::WebContents* contents) {
   return browser->tab_strip_model()->GetIndexOfWebContents(contents);
 }
 
 TabContents* GetActiveTabContents(const Browser* browser) {
   return browser->tab_strip_model()->GetActiveTabContents();
 }
@@ skipping 62 matching lines @@
                     const gfx::Rect& initial_pos,
                     bool user_gesture) {
   // No code for this yet.
   DCHECK(disposition != SAVE_TO_DISK);
   // Can't create a new contents for the current tab - invalid case.
   DCHECK(disposition != CURRENT_TAB);
 
   TabContents* source_tab_contents = NULL;
   BlockedContentTabHelper* source_blocked_content = NULL;
   TabContents* new_tab_contents = TabContents::FromWebContents(new_contents);
-  if (!new_tab_contents)
-    new_tab_contents = new TabContents(new_contents);
+  if (!new_tab_contents) {
+    new_tab_contents =
+        BrowserTabstripTabContentsCreator::CreateTabContents(new_contents);
+  }
   if (source_contents) {
     source_tab_contents = TabContents::FromWebContents(source_contents);
     source_blocked_content = source_tab_contents->blocked_content_tab_helper();
   }
 
   if (source_tab_contents) {
     // Handle blocking of all contents.
     if (source_blocked_content->all_contents_blocked()) {
       source_blocked_content->AddTabContents(new_tab_contents,
                                              disposition,
@@ skipping 39 matching lines @@
 
 void CloseAllTabs(Browser* browser) {
   browser->tab_strip_model()->CloseAllTabs();
 }
 
 TabContents* TabContentsFactory(
     Profile* profile,
     content::SiteInstance* site_instance,
     int routing_id,
     const content::WebContents* base_web_contents) {
-  return new TabContents(content::WebContents::Create(profile,
-                                                      site_instance,
-                                                      routing_id,
-                                                      base_web_contents));
+  return BrowserTabstripTabContentsCreator::CreateTabContents(
+      content::WebContents::Create(profile,
+      site_instance,
+      routing_id,
+      base_web_contents));
 }
 
 TabContents* TabContentsWithSessionStorageFactory(
     Profile* profile,
     content::SiteInstance* site_instance,
     int routing_id,
     const content::WebContents* base_web_contents,
     const content::SessionStorageNamespaceMap& session_storage_namespace_map) {
-  return new TabContents(
+  return BrowserTabstripTabContentsCreator::CreateTabContents(
       content::WebContents::CreateWithSessionStorage(
           profile,
           site_instance,
           routing_id,
           base_web_contents,
           session_storage_namespace_map));
 }
 
 }  // namespace chrome