Revert 42366 - Allow TabContentsDelegate classes to specify whether InfoBars ...

chrome_frame/chrome_frame_npapi_unittest.cc

 // Copyright (c) 2009 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 "gtest/gtest.h"
 #include "gmock/gmock.h"
 #include "chrome_frame/chrome_frame_automation.h"
 #include "chrome_frame/chrome_frame_npapi.h"
 #include "chrome_frame/ff_privilege_check.h"
 
 
 TEST(ChromeFrameNPAPI, DoesNotCrashOnConstruction) {
   ChromeFrameNPAPI* api = new ChromeFrameNPAPI();
   delete api;
 }
 
 
 // All mocks in the anonymous namespace.
 namespace {
 
 using ::testing::_;
 using ::testing::Eq;
-using ::testing::Field;
 using ::testing::Invoke;
 using ::testing::Return;
 using ::testing::StrEq;
 
 // Make mocking privilege test easy.
 class MockPrivilegeTest {
  public:
   MockPrivilegeTest() {
     CHECK(current_ == NULL);
     current_ = this;
@@ skipping 40 matching lines @@
 
   ChromeFrameAutomationClient* CreateAutomationClient() {
     return mock_automation_client_;
   }
 
   ChromeFrameAutomationClient* mock_automation_client_;
 };
 
 class MockAutomationClient: public ChromeFrameAutomationClient {
  public:
-  MOCK_METHOD2(Initialize, bool(ChromeFrameDelegate*, ChromeFrameLaunchParams));
+  MOCK_METHOD6(Initialize, bool(ChromeFrameDelegate*, int, bool,
+                                const std::wstring&, const std::wstring&,
+                                bool));
   MOCK_METHOD1(SetEnableExtensionAutomation,
                void(const std::vector<std::string>&));  // NOLINT
 };
 
 class MockProxyService: public NpProxyService {
  public:
   MOCK_METHOD2(Initialize, bool(NPP instance, ChromeFrameAutomationClient*));
 };
 
 
@@ skipping 24 matching lines @@
     EXPECT_CALL(mock_api, GetLocation())
         .WillOnce(Return(std::string("http://www.google.com")));
     EXPECT_CALL(mock_api, CreatePrefService())
         .WillOnce(Return(mock_proxy));
     EXPECT_CALL(mock_api, GetBrowserIncognitoMode())
         .WillOnce(Return(is_incognito));
 
     EXPECT_CALL(*mock_proxy, Initialize(_, _)).WillRepeatedly(Return(false));
 
     EXPECT_CALL(*mock_automation,
-        Initialize(_, AllOf(
-            Field(&ChromeFrameLaunchParams::perform_version_check, true),
-            Field(&ChromeFrameLaunchParams::profile_name,
-                  StrEq(profile_name)),
-            Field(&ChromeFrameLaunchParams::extra_chrome_arguments,
-                  StrEq(extra_args)),
-            Field(&ChromeFrameLaunchParams::incognito_mode, is_incognito),
-            Field(&ChromeFrameLaunchParams::is_widget_mode, true))))
+        Initialize(_, _, true, StrEq(profile_name), StrEq(extra_args), false))
         .WillOnce(Return(true));
 
     if (expect_privilege_check) {
       EXPECT_CALL(mock_priv, IsFireFoxPrivilegedInvocation(_))
           .WillOnce(Return(is_privileged));
     } else {
       EXPECT_CALL(mock_priv, IsFireFoxPrivilegedInvocation(_))
           .Times(0);  // Fail if privilege check invoked.
     }
   }
@@ skipping 402 matching lines @@
   // And fething it should return the value we just set.
   VOID_TO_NPVARIANT(var);
   EXPECT_TRUE(mock_api.GetProperty(kOnPrivateMessageId, &var));
   EXPECT_TRUE(NPVARIANT_IS_OBJECT(var));
   EXPECT_EQ(kMockNPObject, NPVARIANT_TO_OBJECT(var));
 
   mock_api.Uninitialize();
 }
 
 // TODO(siggi): test invoking postPrivateMessage.