Make pink's TabContentsWrapper change compile on Windows....

chrome/browser/cocoa/tab_strip_controller_unittest.mm

 // Copyright (c) 2010 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>
 
 #import "chrome/browser/browser_window.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/cocoa/new_tab_button.h"
 #import "chrome/browser/cocoa/tab_strip_controller.h"
 #import "chrome/browser/cocoa/tab_strip_view.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tab_contents_wrapper.h"
 #include "chrome/browser/renderer_host/site_instance.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 @interface TestTabStripControllerDelegate :
   NSObject<TabStripControllerDelegate> {
 }
 @end
 
 @implementation TestTabStripControllerDelegate
 - (void)onSelectTabWithContents:(TabContents*)contents {
 }
 - (void)onReplaceTabWithContents:(TabContents*)contents {
 }
 - (void)onSelectedTabChange:(TabStripModelObserver::TabChangeType)change {
 }
 - (void)onTabDetachedWithContents:(TabContents*)contents {
 }
 @end
 
 namespace {
 
 // Stub model delegate
 class TestTabStripDelegate : public TabStripModelDelegate {
  public:
-  virtual TabContents* AddBlankTab(bool foreground) {
+  virtual TabContentsWrapper* AddBlankTab(bool foreground) {
     return NULL;
   }
-  virtual TabContents* AddBlankTabAt(int index, bool foreground) {
+  virtual TabContentsWrapper* AddBlankTabAt(int index, bool foreground) {
     return NULL;
   }
-  virtual Browser* CreateNewStripWithContents(TabContents* contents,
+  virtual Browser* CreateNewStripWithContents(TabContentsWrapper* contents,
                                               const gfx::Rect& window_bounds,
                                               const DockInfo& dock_info,
                                               bool maximize) {
     return NULL;
   }
-  virtual void ContinueDraggingDetachedTab(TabContents* contents,
-                                         const gfx::Rect& window_bounds,
-                                         const gfx::Rect& tab_bounds) {
+  virtual void ContinueDraggingDetachedTab(TabContentsWrapper* contents,
+                                           const gfx::Rect& window_bounds,
+                                           const gfx::Rect& tab_bounds) {
   }
   virtual int GetDragActions() const {
     return 0;
   }
-  virtual TabContents* CreateTabContentsForURL(
+  virtual TabContentsWrapper* CreateTabContentsForURL(
       const GURL& url,
       const GURL& referrer,
       Profile* profile,
       PageTransition::Type transition,
       bool defer_load,
       SiteInstance* instance) const {
     return NULL;
   }
   virtual bool CanDuplicateContentsAt(int index) { return true; }
   virtual void DuplicateContentsAt(int index) { }
   virtual void CloseFrameAfterDragSession() { }
-  virtual void CreateHistoricalTab(TabContents* contents) { }
-  virtual bool RunUnloadListenerBeforeClosing(TabContents* contents) {
+  virtual void CreateHistoricalTab(TabContentsWrapper* contents) { }
+  virtual bool RunUnloadListenerBeforeClosing(TabContentsWrapper* contents) {
     return true;
   }
   virtual bool CanRestoreTab() {
     return true;
   }
   virtual void RestoreTab() {}
 
   virtual bool CanCloseContentsAt(int index) { return true; }
 
   virtual bool CanBookmarkAllTabs() const { return false; }
@@ skipping 63 matching lines @@
   scoped_nsobject<TestTabStripControllerDelegate> controller_delegate_;
   scoped_nsobject<TabStripController> controller_;
 };
 
 // Test adding and removing tabs and making sure that views get added to
 // the tab strip.
 TEST_F(TabStripControllerTest, AddRemoveTabs) {
   EXPECT_TRUE(model_->empty());
   SiteInstance* instance =
       SiteInstance::CreateSiteInstance(browser_helper_.profile());
-  TabContents* tab_contents =
-      new TabContents(browser_helper_.profile(), instance, MSG_ROUTING_NONE,
-                      NULL, NULL);
+  TabContentsWrapper* tab_contents =
+      Browser::TabContentsFactory(browser_helper_.profile(), instance,
+          MSG_ROUTING_NONE, NULL, NULL);
   model_->AppendTabContents(tab_contents, true);
   EXPECT_EQ(model_->count(), 1);
 }
 
 TEST_F(TabStripControllerTest, SelectTab) {
   // TODO(pinkerton): Implement http://crbug.com/10899
 }
 
 TEST_F(TabStripControllerTest, RearrangeTabs) {
   // TODO(pinkerton): Implement http://crbug.com/10899
 }
 
 // Test that changing the number of tabs broadcasts a
 // kTabStripNumberOfTabsChanged notifiction.
 TEST_F(TabStripControllerTest, Notifications) {
   // TODO(pinkerton): Implement http://crbug.com/10899
 }
 
 }  // namespace