Make TabContents ctor private; poke hole for existing callers.

chrome/browser/ui/cocoa/infobars/infobar_controller_unittest.mm

 // Copyright (c) 2011 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/memory/scoped_nsobject.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h"
 #include "chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h"
 #include "chrome/browser/ui/cocoa/infobars/mock_link_infobar_delegate.h"
 #include "chrome/browser/ui/cocoa/run_loop_testing.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #import "content/public/browser/web_contents.h"
 #include "ipc/ipc_message.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 using content::WebContents;
 
+// TODO(avi): Kill this when TabContents goes away.
+class InfoBarControllerContentsCreator {
+ public:
+  static TabContents* CreateTabContents(content::WebContents* contents) {
+    return TabContents::Factory::CreateTabContents(contents);
+  }
+};
+
 @interface InfoBarController (ExposedForTesting)
 - (NSString*)labelString;
 - (NSRect)labelFrame;
 @end
 
 @implementation InfoBarController (ExposedForTesting)
 - (NSString*)labelString {
   return [label_.get() string];
 }
 - (NSRect)labelFrame {
@@ skipping 57 matching lines @@
 namespace {
 
 ///////////////////////////////////////////////////////////////////////////
 // Test fixtures
 
 class LinkInfoBarControllerTest : public CocoaProfileTest,
                                   public MockLinkInfoBarDelegate::Owner {
  public:
   virtual void SetUp() {
     CocoaProfileTest::SetUp();
-    tab_contents_.reset(new TabContents(WebContents::Create(
-        profile(), NULL, MSG_ROUTING_NONE, NULL)));
+    tab_contents_.reset(InfoBarControllerContentsCreator::CreateTabContents(
+        WebContents::Create(profile(), NULL, MSG_ROUTING_NONE, NULL)));
     tab_contents_->infobar_tab_helper()->set_infobars_enabled(false);
 
     delegate_ = new MockLinkInfoBarDelegate(this);
     controller_.reset([[TestLinkInfoBarController alloc]
         initWithDelegate:delegate_
                    owner:tab_contents_.get()->infobar_tab_helper()]);
     container_.reset(
         [[InfoBarContainerTest alloc] initWithController:controller_]);
     [controller_ setContainerController:container_];
     [[test_window() contentView] addSubview:[controller_ view]];
@@ skipping 22 matching lines @@
   }
 
   scoped_ptr<TabContents> tab_contents_;
 };
 
 class ConfirmInfoBarControllerTest : public CocoaProfileTest,
                                      public MockConfirmInfoBarDelegate::Owner {
  public:
   virtual void SetUp() {
     CocoaProfileTest::SetUp();
-    tab_contents_.reset(new TabContents(WebContents::Create(
-        profile(), NULL, MSG_ROUTING_NONE, NULL)));
+    tab_contents_.reset(InfoBarControllerContentsCreator::CreateTabContents(
+        WebContents::Create(profile(), NULL, MSG_ROUTING_NONE, NULL)));
     tab_contents_->infobar_tab_helper()->set_infobars_enabled(false);
 
     delegate_ = new MockConfirmInfoBarDelegate(this);
     controller_.reset([[TestConfirmInfoBarController alloc]
         initWithDelegate:delegate_
                    owner:tab_contents_.get()->infobar_tab_helper()]);
     container_.reset(
         [[InfoBarContainerTest alloc] initWithController:controller_]);
     [controller_ setContainerController:container_];
     [[test_window() contentView] addSubview:[controller_ view]];
@@ skipping 171 matching lines @@
   const CGFloat width = 20;
   NSRect newViewFrame = [[controller_ view] frame];
   newViewFrame.size.width += width;
   [[controller_ view] setFrame:newViewFrame];
 
   NSRect newLabelFrame = [controller_ labelFrame];
   EXPECT_EQ(NSWidth(newLabelFrame), NSWidth(originalLabelFrame) + width);
 }
 
 }  // namespace