Remove remaining references to CEEE.

BUG=107739
TEST=No visible code changes.  Removing constants and code related to CEEE.

Review URL: http://codereview.chromium.org/8909009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115183 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 19 insertions, 21 deletions

diff --git a/chrome_frame/test/automation_client_mock.cc b/chrome_frame/test/automation_client_mock.cc
index 68deba6..70db638 100644
--- a/chrome_frame/test/automation_client_mock.cc
+++ b/chrome_frame/test/automation_client_mock.cc
@@ -106,7 +106,7 @@ TEST(CFACWithChrome, CreateTooFast) {
 
   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);
@@ -138,7 +138,7 @@ TEST(CFACWithChrome, CreateNotSoFast) {
 
   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);
@@ -187,7 +187,7 @@ TEST(CFACWithChrome, NavigateOk) {
 
   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);
@@ -234,7 +234,7 @@ TEST(CFACWithChrome, NavigateFailed) {
 
   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);
@@ -272,7 +272,7 @@ TEST_F(CFACMockTest, MockedCreateTabOk) {
   // 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);
@@ -305,7 +305,7 @@ TEST_F(CFACMockTest, MockedCreateTabFailed) {
   // 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);
@@ -346,7 +346,7 @@ TEST_F(CFACMockTest, OnChannelError) {
 
   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);
@@ -467,7 +467,7 @@ TEST_F(CFACMockTest, NavigateTwiceAfterInitToSameUrl) {
   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));
diff --git a/chrome_frame/test/chrome_frame_automation_mock.h b/chrome_frame/test/chrome_frame_automation_mock.h
index ce3c351..5a61e39 100644
--- a/chrome_frame/test/chrome_frame_automation_mock.h
+++ b/chrome_frame/test/chrome_frame_automation_mock.h
@@ -27,8 +27,7 @@ class AutomationMockDelegate
       int launch_timeout, bool perform_version_check,
       const std::wstring& profile_name,
       const std::wstring& language,
-      const std::wstring& extra_chrome_arguments, bool incognito,
-      bool is_widget_mode)
+      bool incognito, bool is_widget_mode)
       : caller_message_loop_(caller_message_loop), is_connected_(false),
         navigation_result_(false),
         mock_server_(1337, L"127.0.0.1",
@@ -48,8 +47,7 @@ class AutomationMockDelegate
     GURL empty;
     scoped_refptr<ChromeFrameLaunchParams> clp(
         new ChromeFrameLaunchParams(empty, empty, profile_path, profile_name,
-            language, extra_chrome_arguments, incognito, is_widget_mode,
-            false));
+            language, incognito, is_widget_mode, false));
     clp->set_launch_timeout(launch_timeout);
     clp->set_version_check(perform_version_check);
     automation_client_->Initialize(this, clp);
@@ -154,7 +152,7 @@ class AutomationMockLaunch
   typedef AutomationMockDelegate<AutomationMockLaunch> Base;
   AutomationMockLaunch(MessageLoop* caller_message_loop,
                        int launch_timeout)
-      : Base(caller_message_loop, launch_timeout, true, L"", L"", L"", false,
+      : Base(caller_message_loop, launch_timeout, true, L"", L"", false,
              false) {
   }
   virtual void OnAutomationServerReady() {
@@ -172,7 +170,7 @@ class AutomationMockNavigate
   typedef AutomationMockDelegate<AutomationMockNavigate> Base;
   AutomationMockNavigate(MessageLoop* caller_message_loop,
                          int launch_timeout)
-      : Base(caller_message_loop, launch_timeout, true, L"", L"", L"", false,
+      : Base(caller_message_loop, launch_timeout, true, L"", L"", false,
              false) {
   }
   virtual void OnLoad(const GURL& url) {
@@ -187,7 +185,7 @@ class AutomationMockPostMessage
   typedef AutomationMockDelegate<AutomationMockPostMessage> Base;
   AutomationMockPostMessage(MessageLoop* caller_message_loop,
                             int launch_timeout)
-      : Base(caller_message_loop, launch_timeout, true, L"", L"", L"", false,
+      : Base(caller_message_loop, launch_timeout, true, L"", L"", false,
              false),
         postmessage_result_(false) {}
   bool postmessage_result() const {
@@ -215,7 +213,7 @@ class AutomationMockHostNetworkRequestStart
   typedef AutomationMockDelegate<AutomationMockHostNetworkRequestStart> Base;
   AutomationMockHostNetworkRequestStart(MessageLoop* caller_message_loop,
       int launch_timeout)
-      : Base(caller_message_loop, launch_timeout, true, L"", L"", L"", false,
+      : Base(caller_message_loop, launch_timeout, true, L"", L"", false,
              false),
         request_start_result_(false) {
     if (automation()) {
diff --git a/chrome_frame/test/proxy_factory_mock.cc b/chrome_frame/test/proxy_factory_mock.cc
index 5b6ecbc..62bd3da 100644
--- a/chrome_frame/test/proxy_factory_mock.cc
+++ b/chrome_frame/test/proxy_factory_mock.cc
@@ -23,7 +23,7 @@ TEST(ProxyFactoryTest, CreateDestroy) {
   FilePath profile_path;
   scoped_refptr<ChromeFrameLaunchParams> params(
       new ChromeFrameLaunchParams(empty, empty, profile_path,
-          L"Adam.N.Epilinter", L"", L"", false, false, false));
+          L"Adam.N.Epilinter", L"", false, false, false));
   params->set_launch_timeout(0);
   params->set_version_check(false);
 
@@ -44,7 +44,7 @@ TEST(ProxyFactoryTest, CreateSameProfile) {
   FilePath profile_path;
   scoped_refptr<ChromeFrameLaunchParams> params(
       new ChromeFrameLaunchParams(empty, empty, profile_path,
-          L"Dr. Gratiano Forbeson", L"", L"", false, false, false));
+          L"Dr. Gratiano Forbeson", L"", false, false, false));
   params->set_launch_timeout(0);
   params->set_version_check(false);
 
@@ -69,13 +69,13 @@ TEST(ProxyFactoryTest, CreateDifferentProfiles) {
   FilePath profile_path;
   scoped_refptr<ChromeFrameLaunchParams> params1(
       new ChromeFrameLaunchParams(empty, empty, profile_path,
-          L"Adam.N.Epilinter", L"", L"", false, false, false));
+          L"Adam.N.Epilinter", L"", false, false, false));
   params1->set_launch_timeout(0);
   params1->set_version_check(false);
 
   scoped_refptr<ChromeFrameLaunchParams> params2(
       new ChromeFrameLaunchParams(empty, empty, profile_path,
-          L"Dr. Gratiano Forbeson", L"", L"", false, false, false));
+          L"Dr. Gratiano Forbeson", L"", false, false, false));
   params2->set_launch_timeout(0);
   params2->set_version_check(false);
 
@@ -102,7 +102,7 @@ TEST(ProxyFactoryTest, DISABLED_FastCreateDestroy) {
   FilePath profile_path;
   scoped_refptr<ChromeFrameLaunchParams> params(
       new ChromeFrameLaunchParams(empty, empty, profile_path,
-          L"Dr. Gratiano Forbeson", L"", L"", false, false, false));
+          L"Dr. Gratiano Forbeson", L"", false, false, false));
   params->set_launch_timeout(10000);
   params->set_version_check(false);