1 files changed, 66 insertions, 7 deletions

diff --git a/chrome_frame/test/automation_client_mock.cc b/chrome_frame/test/automation_client_mock.cc
index f699635..b64a7cb 100644
--- a/chrome_frame/test/automation_client_mock.cc
+++ b/chrome_frame/test/automation_client_mock.cc
@@ -100,7 +100,17 @@ TEST(CFACWithChrome, CreateTooFast) {
       .Times(1)
       .WillOnce(QUIT_LOOP(loop));
 
-  EXPECT_TRUE(client->Initialize(&cfd, timeout, false, profile, L"", false));
+  ChromeFrameLaunchParams cfp = {
+    timeout,
+    GURL(),
+    GURL(),
+    profile,
+    L"",
+    false,
+    false,
+    false
+  };
+  EXPECT_TRUE(client->Initialize(&cfd, cfp));
   loop.RunFor(10);
   client->Uninitialize();
 }
@@ -125,7 +135,17 @@ TEST(CFACWithChrome, CreateNotSoFast) {
   EXPECT_CALL(cfd, OnAutomationServerLaunchFailed(_, _))
       .Times(0);
 
-  EXPECT_TRUE(client->Initialize(&cfd, timeout, false, profile, L"", false));
+  ChromeFrameLaunchParams cfp = {
+    timeout,
+    GURL(),
+    GURL(),
+    profile,
+    L"",
+    false,
+    false,
+    false
+  };
+  EXPECT_TRUE(client->Initialize(&cfd, cfp));
 
   loop.RunFor(11);
   client->Uninitialize();
@@ -165,7 +185,17 @@ TEST(CFACWithChrome, NavigateOk) {
         .WillOnce(QUIT_LOOP(loop));
   }
 
-  EXPECT_TRUE(client->Initialize(&cfd, timeout, false, profile, L"", false));
+  ChromeFrameLaunchParams cfp = {
+    timeout,
+    GURL(),
+    GURL(),
+    profile,
+    L"",
+    false,
+    false,
+    false
+  };
+  EXPECT_TRUE(client->Initialize(&cfd, cfp));
   loop.RunFor(10);
   client->Uninitialize();
   client = NULL;
@@ -204,7 +234,17 @@ TEST(CFACWithChrome, NavigateFailed) {
       .Times(1)
       .WillOnce(QUIT_LOOP_SOON(loop, 2));
 
-  EXPECT_TRUE(client->Initialize(&cfd, 10000, false, profile, L"", false));
+  ChromeFrameLaunchParams cfp = {
+    10000,
+    GURL(),
+    GURL(),
+    profile,
+    L"",
+    false,
+    false,
+    false
+  };
+  EXPECT_TRUE(client->Initialize(&cfd, cfp));
 
   loop.RunFor(10);
   client->Uninitialize();
@@ -237,7 +277,17 @@ TEST_F(CFACMockTest, MockedCreateTabOk) {
   EXPECT_CALL(proxy_, CancelAsync(_)).Times(testing::AnyNumber());
 
   // Here we go!
-  EXPECT_TRUE(client_->Initialize(&cfd_, timeout, false, profile_, L"", false));
+  ChromeFrameLaunchParams cfp = {
+    timeout,
+    GURL(),
+    GURL(),
+    profile_,
+    L"",
+    false,
+    false,
+    false
+  };
+  EXPECT_TRUE(client_->Initialize(&cfd_, cfp));
   loop_.RunFor(10);
   client_->Uninitialize();
 }
@@ -262,8 +312,17 @@ TEST_F(CFACMockTest, MockedCreateTabFailed) {
   Set_CFD_LaunchFailed(AUTOMATION_CREATE_TAB_FAILED);
 
   // Here we go!
-  EXPECT_TRUE(client_->Initialize(&cfd_, timeout_, false, profile_, L"",
-              false));
+  ChromeFrameLaunchParams cfp = {
+    timeout_,
+    GURL(),
+    GURL(),
+    profile_,
+    L"",
+    false,
+    false,
+    false
+  };
+  EXPECT_TRUE(client_->Initialize(&cfd_, cfp));
   loop_.RunFor(4);
   client_->Uninitialize();
 }