Misc. infobar stuff:

chrome/browser/ui/cocoa/translate/translate_infobar_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>
 
 #import "base/memory/scoped_nsobject.h"
 #import "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #import "chrome/app/chrome_command_ids.h"  // For translate menu command ids.
 #import "chrome/browser/translate/translate_infobar_delegate.h"
 #import "chrome/browser/ui/cocoa/browser_test_helper.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar.h"
 #import "chrome/browser/ui/cocoa/translate/translate_infobar_base.h"
 #import "chrome/browser/ui/cocoa/translate/before_translate_infobar_controller.h"
+#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #import "content/browser/site_instance.h"
 #import "content/browser/tab_contents/tab_contents.h"
 #import "testing/gmock/include/gmock/gmock.h"
 #import "testing/gtest/include/gtest/gtest.h"
 #import "testing/platform_test.h"
 
 namespace {
 
 // All states the translate toolbar can assume.
 TranslateInfoBarDelegate::Type kTranslateToolbarStates[] = {
@@ skipping 34 matching lines @@
   MOCK_METHOD0(RevertTranslation, void());
   MOCK_METHOD0(TranslationDeclined, void());
   MOCK_METHOD0(ToggleLanguageBlacklist, void());
   MOCK_METHOD0(ToggleSiteBlacklist, void());
   MOCK_METHOD0(ToggleAlwaysTranslate, void());
 };
 
 class TranslationInfoBarTest : public CocoaTest {
  public:
   BrowserTestHelper browser_helper_;
-  scoped_ptr<TabContents> tab_contents;
+  scoped_ptr<TabContentsWrapper> tab_contents;
   scoped_ptr<MockTranslateInfoBarDelegate> infobar_delegate;
   scoped_nsobject<TranslateInfoBarControllerBase> infobar_controller;
 
  public:
   // Each test gets a single Mock translate delegate for the lifetime of
   // the test.
   virtual void SetUp() {
     CocoaTest::SetUp();
-   tab_contents.reset(
-        new TabContents(browser_helper_.profile(),
-                        NULL,
-                        MSG_ROUTING_NONE,
-                        NULL,
-                        NULL));
+   tab_contents.reset(new TabContentsWrapper(new TabContents(
+       browser_helper_.profile(), NULL, MSG_ROUTING_NONE, NULL, NULL)));
     CreateInfoBar();
   }
 
   void CreateInfoBar() {
     CreateInfoBar(TranslateInfoBarDelegate::BEFORE_TRANSLATE);
   }
 
   void CreateInfoBar(TranslateInfoBarDelegate::Type type) {
     TranslateErrors::Type error = TranslateErrors::NONE;
     if (type == TranslateInfoBarDelegate::TRANSLATION_ERROR)
       error = TranslateErrors::NETWORK;
-    infobar_delegate.reset(
-        new MockTranslateInfoBarDelegate(type, error, tab_contents.get()));
+    infobar_delegate.reset(new MockTranslateInfoBarDelegate(type, error,
+        tab_contents->tab_contents()));
     [[infobar_controller view] removeFromSuperview];
     scoped_ptr<InfoBar> infobar(
-        static_cast<InfoBarDelegate*>(infobar_delegate.get())->CreateInfoBar());
+        static_cast<InfoBarDelegate*>(infobar_delegate.get())->
+            CreateInfoBar(tab_contents.get()));
     infobar_controller.reset(
         reinterpret_cast<TranslateInfoBarControllerBase*>(
             infobar->controller()));
     // We need to set the window to be wide so that the options button
     // doesn't overlap the other buttons.
     [test_window() setContentSize:NSMakeSize(2000, 500)];
     [[infobar_controller view] setFrame:NSMakeRect(0, 0, 2000, 500)];
     [[test_window() contentView] addSubview:[infobar_controller view]];
   }
 };
@@ skipping 134 matching lines @@
     translate_prefs.IncrementTranslationDeniedCount("en");
   }
   CreateInfoBar(TranslateInfoBarDelegate::BEFORE_TRANSLATE);
   BeforeTranslateInfobarController* controller =
       (BeforeTranslateInfobarController*)infobar_controller.get();
   EXPECT_TRUE([[controller alwaysTranslateButton] superview] == nil);
   EXPECT_TRUE([[controller neverTranslateButton] superview] != nil);
 }
 
 } // namespace