Make TabContents ctor private; poke hole for existing callers.

chrome/browser/ui/cocoa/web_dialog_window_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/web_dialog_window_controller.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/ui/browser_dialogs.h"
 #import "chrome/browser/ui/cocoa/browser_command_executor.h"
 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/gfx/size.h"
 #include "ui/web_dialogs/web_dialog_delegate.h"
 #include "ui/web_dialogs/web_dialog_web_contents_delegate.h"
 
 using content::NativeWebKeyboardEvent;
 using content::WebContents;
 using content::WebUIMessageHandler;
 using ui::WebDialogDelegate;
 using ui::WebDialogUI;
 using ui::WebDialogWebContentsDelegate;
 
+// TODO(avi): Kill this when TabContents goes away.
+class WebDialogWindowControllerTabContentsCreator {
+ public:
+  static TabContents* CreateTabContents(content::WebContents* contents) {
+    return TabContents::Factory::CreateTabContents(contents);
+  }
+};
+
 // Thin bridge that routes notifications to
 // WebDialogWindowController's member variables.
 class WebDialogWindowDelegateBridge
     : public WebDialogDelegate,
       public WebDialogWebContentsDelegate {
 public:
   // All parameters must be non-NULL/non-nil.
   WebDialogWindowDelegateBridge(WebDialogWindowController* controller,
                                 content::BrowserContext* context,
                                 WebDialogDelegate* delegate);
@@ skipping 290 matching lines @@
   [window setDelegate:self];
   [window setTitle:base::SysUTF16ToNSString(delegate->GetDialogTitle())];
   [window setMinSize:dialogRect.size];
   [window center];
   delegate_.reset(
       new WebDialogWindowDelegateBridge(self, context, delegate));
   return self;
 }
 
 - (void)loadDialogContents {
-  tabContents_.reset(new TabContents(WebContents::Create(
-      delegate_->browser_context(), NULL, MSG_ROUTING_NONE, NULL)));
+  tabContents_.reset(
+      WebDialogWindowControllerTabContentsCreator::CreateTabContents(
+          WebContents::Create(
+              delegate_->browser_context(), NULL, MSG_ROUTING_NONE, NULL)));
   [[self window]
       setContentView:tabContents_->web_contents()->GetNativeView()];
   tabContents_->web_contents()->SetDelegate(delegate_.get());
 
   // This must be done before loading the page; see the comments in
   // WebDialogUI.
   WebDialogUI::SetDelegate(tabContents_->web_contents(), delegate_.get());
 
   tabContents_->web_contents()->GetController().LoadURL(
       delegate_->GetDialogContentURL(),
       content::Referrer(),
       content::PAGE_TRANSITION_START_PAGE,
       std::string());
 
   // TODO(akalin): add accelerator for ESC to close the dialog box.
   //
   // TODO(akalin): Figure out why implementing (void)cancel:(id)sender
   // to do the above doesn't work.
 }
 
 - (void)windowWillClose:(NSNotification*)notification {
   delegate_->WindowControllerClosed();
   [self autorelease];
 }
 
 @end