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

10 files changed, 31 insertions, 55 deletions

diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc
index 1ee9070..8e84714 100644
--- a/chrome_frame/chrome_active_document.cc
+++ b/chrome_frame/chrome_active_document.cc
@@ -1081,7 +1081,7 @@ bool ChromeActiveDocument::LaunchUrl(const ChromeFrameUrl& cf_url,
     // If no profile was given, then make use of the host process's name.
     if (profile.empty())
       profile = GetHostProcessName(false);
-    return InitializeAutomation(profile, L"", IsIEInPrivate(),
+    return InitializeAutomation(profile, IsIEInPrivate(),
                                 false, cf_url.gurl(), GURL(referrer),
                                 false);
   }
diff --git a/chrome_frame/chrome_frame_activex.cc b/chrome_frame/chrome_frame_activex.cc
index 425cc2f..654f640 100644
--- a/chrome_frame/chrome_frame_activex.cc
+++ b/chrome_frame/chrome_frame_activex.cc
@@ -470,20 +470,10 @@ HRESULT ChromeFrameActivex::IOleObject_SetClientSite(
 
     InitializeAutomationSettings();
 
-    // To avoid http://code.google.com/p/chromium/issues/detail?id=63427,
-    // we always pass this flag needed by CEEE. It has no effect on
-    // normal CF operation.
-    //
-    // Extra arguments are passed on verbatim, so we add the -- prefix.
-    std::wstring chrome_extra_arguments(L"--");
-    chrome_extra_arguments.append(
-        ASCIIToWide(switches::kEnableExperimentalExtensionApis));
-
     url_fetcher_->set_frame_busting(!is_privileged());
     automation_client_->SetUrlFetcher(url_fetcher_.get());
-    if (!InitializeAutomation(profile_name, chrome_extra_arguments,
-                              IsIEInPrivate(), true, GURL(utf8_url),
-                              GURL(), false)) {
+    if (!InitializeAutomation(profile_name, IsIEInPrivate(), true,
+                              GURL(utf8_url), GURL(), false)) {
       DLOG(ERROR) << "Failed to navigate to url:" << utf8_url;
       return E_FAIL;
     }
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc
index 2aae122..f6127dc 100644
--- a/chrome_frame/chrome_frame_automation.cc
+++ b/chrome_frame/chrome_frame_automation.cc
@@ -298,10 +298,6 @@ void AutomationProxyCacheEntry::CreateProxy(ChromeFrameLaunchParams* params,
       command_line->AppendSwitchNative(switches::kLang, params->language());
 
     command_line_string = command_line->GetCommandLineString();
-    // If there are any extra arguments, append them to the command line.
-    if (!params->extra_arguments().empty()) {
-      command_line_string += L' ' + params->extra_arguments();
-    }
   }
 
   automation_server_launch_start_time_ = base::TimeTicks::Now();
@@ -670,7 +666,7 @@ bool ChromeFrameAutomationClient::InitiateNavigation(
       FilePath profile_path;
       chrome_launch_params_ = new ChromeFrameLaunchParams(parsed_url,
           referrer_gurl, profile_path, L"", SimpleResourceLoader::GetLanguage(),
-          L"", false, false, route_all_top_level_navigations_);
+          false, false, route_all_top_level_navigations_);
     } else {
       chrome_launch_params_->set_referrer(referrer_gurl);
       chrome_launch_params_->set_url(parsed_url);
diff --git a/chrome_frame/chrome_frame_automation.h b/chrome_frame/chrome_frame_automation.h
index b1cef96..59060e3 100644
--- a/chrome_frame/chrome_frame_automation.h
+++ b/chrome_frame/chrome_frame_automation.h
@@ -111,14 +111,13 @@ class ChromeFrameLaunchParams :  // NOLINT
                           const FilePath& profile_path,
                           const std::wstring& profile_name,
                           const std::wstring& language,
-                          const std::wstring& extra_arguments,
                           bool incognito, bool widget_mode,
                           bool route_all_top_level_navigations)
     : launch_timeout_(kCommandExecutionTimeout), url_(url),
       referrer_(referrer), profile_path_(profile_path),
       profile_name_(profile_name), language_(language),
-      extra_arguments_(extra_arguments), version_check_(true),
-      incognito_mode_(incognito), is_widget_mode_(widget_mode),
+      version_check_(true), incognito_mode_(incognito),
+      is_widget_mode_(widget_mode),
       route_all_top_level_navigations_(route_all_top_level_navigations) {
   }
 
@@ -161,10 +160,6 @@ class ChromeFrameLaunchParams :  // NOLINT
     return language_;
   }
 
-  const std::wstring& extra_arguments() const {
-    return extra_arguments_;
-  }
-
   bool version_check() const {
     return version_check_;
   }
@@ -197,7 +192,6 @@ class ChromeFrameLaunchParams :  // NOLINT
   FilePath profile_path_;
   std::wstring profile_name_;
   std::wstring language_;
-  std::wstring extra_arguments_;
   bool version_check_;
   bool incognito_mode_;
   bool is_widget_mode_;
diff --git a/chrome_frame/chrome_frame_plugin.h b/chrome_frame/chrome_frame_plugin.h
index 51106ab..a6066f9 100644
--- a/chrome_frame/chrome_frame_plugin.h
+++ b/chrome_frame/chrome_frame_plugin.h
@@ -66,7 +66,6 @@ END_MSG_MAP()
   }
 
   bool InitializeAutomation(const std::wstring& profile_name,
-                            const std::wstring& extra_chrome_arguments,
                             bool incognito, bool is_widget_mode,
                             const GURL& url, const GURL& referrer,
                             bool route_all_top_level_navigations) {
@@ -83,8 +82,7 @@ END_MSG_MAP()
     FilePath actual_profile_name = profile_path.BaseName();
     launch_params_ = new ChromeFrameLaunchParams(url, referrer, profile_path,
         actual_profile_name.value(), SimpleResourceLoader::GetLanguage(),
-        extra_chrome_arguments, incognito_mode, is_widget_mode,
-        route_all_top_level_navigations);
+        incognito_mode, is_widget_mode, route_all_top_level_navigations);
     return automation_client_->Initialize(this, launch_params_);
   }
 
diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc
index b984e73..6e0373b 100644
--- a/chrome_frame/chrome_tab.cc
+++ b/chrome_frame/chrome_tab.cc
@@ -17,6 +17,7 @@
 #include "base/logging.h"
 #include "base/logging_win.h"
 #include "base/path_service.h"
+#include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
@@ -253,14 +254,13 @@ HRESULT RefreshElevationPolicy() {
 HRESULT SetupRunOnce() {
   HRESULT result = E_FAIL;
 
-  std::wstring channel_name;
+  string16 channel_name;
   if (base::win::GetVersion() < base::win::VERSION_VISTA &&
       GoogleUpdateSettings::GetChromeChannelAndModifiers(true, &channel_name)) {
     std::transform(channel_name.begin(), channel_name.end(),
                    channel_name.begin(), tolower);
-    // Use this only for the dev channel and CEEE channels.
-    if (channel_name.find(L"dev") != std::wstring::npos ||
-        channel_name.find(L"ceee") != std::wstring::npos) {
+    // Use this only for the dev channel.
+    if (channel_name.find(L"dev") != string16::npos) {
       HKEY hive = HKEY_CURRENT_USER;
       if (IsSystemProcess()) {
         // For system installs, our updates will be running as SYSTEM which
diff --git a/chrome_frame/delete_chrome_history.cc b/chrome_frame/delete_chrome_history.cc
index c83944c..03313d1 100644
--- a/chrome_frame/delete_chrome_history.cc
+++ b/chrome_frame/delete_chrome_history.cc
@@ -74,7 +74,7 @@ STDMETHODIMP DeleteChromeHistory::DeleteBrowsingHistory(DWORD flags) {
   if (integrity_level == base::LOW_INTEGRITY) {
     return S_OK;
   }
-  if (!InitializeAutomation(GetHostProcessName(false), L"", false, false,
+  if (!InitializeAutomation(GetHostProcessName(false), false, false,
                             GURL(), GURL(), true)) {
     return E_UNEXPECTED;
   }
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);