Remove remaining references to CEEE.

chrome_frame/test/automation_client_mock.cc

 // 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.
 
 #include "chrome_frame/test/automation_client_mock.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "chrome/common/automation_messages.h"
 #include "chrome_frame/custom_sync_call_context.h"
@@ skipping 88 matching lines @@
 
   scoped_refptr<ChromeFrameAutomationClient> client;
   client = new ChromeFrameAutomationClient();
 
   EXPECT_CALL(cfd, OnAutomationServerLaunchFailed(AUTOMATION_TIMEOUT, _))
       .Times(1)
       .WillOnce(QUIT_LOOP(loop));
 
   GURL empty;
   scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
-      empty, empty, profile_path, profile_path.BaseName().value(), L"", L"",
+      empty, empty, profile_path, profile_path.BaseName().value(), L"",
       false, false, false));
   clp->set_launch_timeout(timeout);
   clp->set_version_check(false);
   EXPECT_TRUE(client->Initialize(&cfd, clp));
   loop.RunFor(10);
   client->Uninitialize();
 }
 
 // This test may fail if Chrome take more that 10 seconds (timeout var) to
 // launch. In this case GMock shall print something like "unexpected call to
@@ skipping 11 matching lines @@
 
   EXPECT_CALL(cfd, OnAutomationServerReady())
       .Times(1)
       .WillOnce(QUIT_LOOP(loop));
 
   EXPECT_CALL(cfd, OnAutomationServerLaunchFailed(_, _))
       .Times(0);
 
   GURL empty;
   scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
-      empty, empty, profile_path, profile_path.BaseName().value(), L"", L"",
+      empty, empty, profile_path, profile_path.BaseName().value(), L"",
       false, false, false));
   clp->set_launch_timeout(timeout);
   clp->set_version_check(false);
   EXPECT_TRUE(client->Initialize(&cfd, clp));
 
   loop.RunFor(11);
   client->Uninitialize();
   client = NULL;
 }
 
@@ skipping 28 matching lines @@
 
     EXPECT_CALL(cfd, OnUpdateTargetUrl(_)).Times(testing::AtMost(1));
 
     EXPECT_CALL(cfd, OnLoad(_))
         .Times(1)
         .WillOnce(QUIT_LOOP(loop));
   }
 
   GURL empty;
   scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
-      empty, empty, profile_path, profile_path.BaseName().value(), L"", L"",
+      empty, empty, profile_path, profile_path.BaseName().value(), L"",
       false, false, false));
   clp->set_launch_timeout(timeout);
   clp->set_version_check(false);
   EXPECT_TRUE(client->Initialize(&cfd, clp));
   loop.RunFor(10);
   client->Uninitialize();
   client = NULL;
 }
 
 TEST(CFACWithChrome, NavigateFailed) {
@@ skipping 26 matching lines @@
 
   EXPECT_CALL(cfd, OnUpdateTargetUrl(_)).Times(testing::AnyNumber());
   EXPECT_CALL(cfd, OnLoad(_)).Times(testing::AtMost(1));
 
   EXPECT_CALL(cfd, OnNavigationFailed(_, GURL(url)))
       .Times(1)
       .WillOnce(QUIT_LOOP_SOON(loop, 2));
 
   GURL empty;
   scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
-      empty, empty, profile_path, profile_path.BaseName().value(), L"", L"",
+      empty, empty, profile_path, profile_path.BaseName().value(), L"",
       false, false, false));
   clp->set_launch_timeout(10000);
   clp->set_version_check(false);
   EXPECT_TRUE(client->Initialize(&cfd, clp));
 
   loop.RunFor(10);
   client->Uninitialize();
   client = NULL;
 }
 
@@ skipping 17 matching lines @@
       .WillOnce(Return(tab_));
 
   EXPECT_CALL(cfd_, OnAutomationServerReady())
       .WillOnce(QUIT_LOOP(loop_));
 
   EXPECT_CALL(mock_proxy_, CancelAsync(_)).Times(testing::AnyNumber());
 
   // Here we go!
   GURL empty;
   scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
-      empty, empty, profile_path_, profile_path_.BaseName().value(), L"", L"",
+      empty, empty, profile_path_, profile_path_.BaseName().value(), L"",
       false, false, false));
   clp->set_launch_timeout(timeout);
   clp->set_version_check(false);
   EXPECT_TRUE(client_->Initialize(&cfd_, clp));
   loop_.RunFor(10);
 
   EXPECT_CALL(mock_proxy_, ReleaseTabProxy(testing::Eq(tab_handle_))).Times(1);
   client_->Uninitialize();
 }
 
@@ skipping 12 matching lines @@
 
   EXPECT_CALL(mock_proxy_, CreateTabProxy(_)).Times(0);
 
   EXPECT_CALL(mock_proxy_, CancelAsync(_)).Times(testing::AnyNumber());
 
   Set_CFD_LaunchFailed(AUTOMATION_CREATE_TAB_FAILED);
 
   // Here we go!
   GURL empty;
   scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
-      empty, empty, profile_path_, profile_path_.BaseName().value(), L"", L"",
+      empty, empty, profile_path_, profile_path_.BaseName().value(), L"",
       false, false, false));
   clp->set_launch_timeout(timeout_);
   clp->set_version_check(false);
   EXPECT_TRUE(client_->Initialize(&cfd_, clp));
   loop_.RunFor(4);
   client_->Uninitialize();
 }
 
 class TestChromeFrameAutomationProxyImpl
     : public ChromeFrameAutomationProxyImpl {
@@ skipping 20 matching lines @@
   // No tabs should do nothing yet still not fail either.
   proxy.FakeChannelError();
 }
 
 TEST_F(CFACMockTest, OnChannelError) {
   TestChromeFrameAutomationProxyImpl proxy;
   returned_proxy_ = &proxy;
 
   GURL empty;
   scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
-      empty, empty, profile_path_, profile_path_.BaseName().value(), L"", L"",
+      empty, empty, profile_path_, profile_path_.BaseName().value(), L"",
       false, false, false));
   clp->set_launch_timeout(1);  // Unneeded timeout, but can't be 0.
   clp->set_version_check(false);
 
   HWND h1 = ::GetDesktopWindow();
   HWND h2 = ::GetDesktopWindow();
   EXPECT_CALL(proxy, SendAsAsync(testing::Property(
     &IPC::SyncMessage::type, AutomationMsg_CreateExternalTab::ID),
     testing::NotNull(), _)).Times(3)
         .WillOnce(HandleCreateTab(tab_handle_, h1, h2, 99))
@@ skipping 100 matching lines @@
           .Times(1)
           .WillOnce(Return(true));
 
   EXPECT_CALL(cfd_, GetBounds(_)).Times(1);
 
   // Here we go!
   GURL empty;
   scoped_refptr<ChromeFrameLaunchParams> launch_params(
       new ChromeFrameLaunchParams(
           GURL("http://www.nonexistent.com"), empty, profile_path_,
-          profile_path_.BaseName().value(), L"", L"", false, false, false));
+          profile_path_.BaseName().value(), L"", false, false, false));
   launch_params->set_launch_timeout(timeout);
   launch_params->set_version_check(false);
   EXPECT_TRUE(client_->Initialize(&cfd_, launch_params));
   loop_.RunFor(10);
 
   EXPECT_CALL(mock_proxy_, ReleaseTabProxy(testing::Eq(tab_handle_))).Times(1);
   client_->Uninitialize();
 }