Change "enable-ceee" to "ceee" to match the installer.

TEST=CEEE gets registered when running the installer with --ceee.
BUG=61609

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

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

5 files changed, 17 insertions, 16 deletions

diff --git a/ceee/common/install_utils.cc b/ceee/common/install_utils.cc
index e342023..e6870f7 100644
--- a/ceee/common/install_utils.cc
+++ b/ceee/common/install_utils.cc
@@ -15,10 +15,11 @@
 
 namespace installer {
   namespace switches {
-    // TODO(joi@chromium.org) Move to chrome/installer/util_constants.h
+    // TODO(joi): Move to chrome/installer/util_constants.h
     // when we refactor this logic to be in the installer rather than
     // on the registration entrypoints.
-    const char kEnableCeee[] = "enable-ceee";
+    const char kEnableCeee[] = "ceee";
+    // TODO(joi): The installer supports only "ceee".
     const char kEnableFfCeee[] = "enable-ff-ceee";
   }
 }
@@ -35,7 +36,7 @@ bool ShouldRegisterImpl(bool check_firefox) {
   }
 
   // Failing that, it's some kind of install scenario, so the
-  // --enable-ceee flag must be provided. It should be ignored
+  // --ceee flag must be provided. It should be ignored
   // unless --chrome-frame is also specified, so we check for
   // both.
   //
diff --git a/ceee/common/install_utils.h b/ceee/common/install_utils.h
index 6871ac4..39c0d48 100644
--- a/ceee/common/install_utils.h
+++ b/ceee/common/install_utils.h
@@ -30,13 +30,13 @@
 
 namespace ceee_install_utils {
 
-// Returns true if the --enable-ceee flag was passed to the process
+// Returns true if the --ceee flag was passed to the process
 // that loaded this DLL, or if the process loading the DLL is
 // regsvr32 (i.e. it's a developer that explicitly wants to register).
 bool ShouldRegisterCeee();
 
 // Returns true if the --enable-ff-ceee flag was passed to the process
-// that loaded this DLL in addition to the --enable-ceee flag, or if
+// that loaded this DLL in addition to the --ceee flag, or if
 // the process loading the DLL is regsvr32 (i.e. it's a developer that
 // explicitly wants to register).
 bool ShouldRegisterFfCeee();
diff --git a/ceee/common/install_utils_unittest.cc b/ceee/common/install_utils_unittest.cc
index 5d918c7..f06b037 100644
--- a/ceee/common/install_utils_unittest.cc
+++ b/ceee/common/install_utils_unittest.cc
@@ -45,7 +45,7 @@ TEST(ShouldRegisterCeee, TrueIfBothFlagsPresent) {
   testing::MockKernel32 kernel32;
   EXPECT_CALL(kernel32, GetCommandLine()).WillOnce(
       Return(const_cast<wchar_t*>(
-          L"mini_installer.exe --enable-ceee --chrome-frame")));
+          L"mini_installer.exe --ceee --chrome-frame")));
   ASSERT_TRUE(ceee_install_utils::ShouldRegisterCeee());
 }
 
@@ -53,7 +53,7 @@ TEST(ShouldRegisterFfCeee, TrueIfAllFlagsPresent) {
   testing::MockKernel32 kernel32;
   EXPECT_CALL(kernel32, GetCommandLine()).Times(2).WillRepeatedly(
       Return(const_cast<wchar_t*>(
-          L"mini_installer.exe --enable-ceee --chrome-frame "
+          L"mini_installer.exe --ceee --chrome-frame "
           L"--enable-ff-ceee")));
   EXPECT_TRUE(ceee_install_utils::ShouldRegisterFfCeee());
   // Check this as well just in case.
@@ -64,7 +64,7 @@ TEST(ShouldRegisterCeee, FalseIfOneFlagPresent) {
   testing::MockKernel32 kernel32;
   EXPECT_CALL(kernel32, GetCommandLine())
     .WillOnce(Return(const_cast<wchar_t*>(
-        L"mini_installer.exe --enable-ceee")))
+        L"mini_installer.exe --ceee")))
     .WillOnce(Return(const_cast<wchar_t*>(
         L"mini_installer.exe --chrome-frame")));
   ASSERT_FALSE(ceee_install_utils::ShouldRegisterCeee());
@@ -75,11 +75,11 @@ TEST(ShouldRegisterFfCeee, FalseIfOnlyTwoFlagsPresent) {
   testing::MockKernel32 kernel32;
   EXPECT_CALL(kernel32, GetCommandLine())
     .WillOnce(Return(const_cast<wchar_t*>(
-        L"mini_installer.exe --enable-ceee --chrome-frame")))
+        L"mini_installer.exe --ceee --chrome-frame")))
     .WillOnce(Return(const_cast<wchar_t*>(
         L"mini_installer.exe --chrome-frame --enable-ff-ceee")))
     .WillOnce(Return(const_cast<wchar_t*>(
-        L"mini_installer.exe --enable-ceee --enable-ff-ceee")));
+        L"mini_installer.exe --ceee --enable-ff-ceee")));
   ASSERT_FALSE(ceee_install_utils::ShouldRegisterFfCeee());
   ASSERT_FALSE(ceee_install_utils::ShouldRegisterFfCeee());
   ASSERT_FALSE(ceee_install_utils::ShouldRegisterFfCeee());
@@ -97,7 +97,7 @@ TEST(ShouldRegisterFfCeee, FalseIfInvertedFlagPresent) {
   testing::MockKernel32 kernel32;
   EXPECT_CALL(kernel32, GetCommandLine()).WillOnce(
     Return(const_cast<wchar_t*>(
-        L"mini_installer.exe --enable-ceee --noenable-ff-ceee "
+        L"mini_installer.exe --ceee --noenable-ff-ceee "
         L"--chrome-frame")));
   ASSERT_FALSE(ceee_install_utils::ShouldRegisterFfCeee());
 }
@@ -114,7 +114,7 @@ TEST(ShouldRegisterFfCeee, FalseIfBogusFlagPresent) {
   testing::MockKernel32 kernel32;
   EXPECT_CALL(kernel32, GetCommandLine()).WillOnce(
     Return(const_cast<wchar_t*>(
-        L"mini_installer.exe --enable-ceee --enable-ff-ceeez "
+        L"mini_installer.exe --ceee --enable-ff-ceeez "
         L"--chrome-frame")));
   ASSERT_FALSE(ceee_install_utils::ShouldRegisterFfCeee());
 }
diff --git a/ceee/ie/plugin/toolband/toolband_module.cc b/ceee/ie/plugin/toolband/toolband_module.cc
index e1b068a..bb5ee4a 100644
--- a/ceee/ie/plugin/toolband/toolband_module.cc
+++ b/ceee/ie/plugin/toolband/toolband_module.cc
@@ -269,7 +269,7 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) {
 //
 // This is not the actual entrypoint; see the define right below this
 // function, which keeps us safe from ever forgetting to check for
-// the --enable-ceee flag.
+// the --ceee flag.
 STDAPI DllRegisterServerImpl(void) {
   // Registers objects.
   HRESULT hr = module.DllRegisterServer();
@@ -280,7 +280,7 @@ CEEE_DEFINE_DLL_REGISTER_SERVER()
 
 // DllUnregisterServer - Removes entries from the system registry
 STDAPI DllUnregisterServer(void) {
-  // We always allow unregistration, even if no --enable-ceee install flag.
+  // We always allow unregistration, even if no --ceee install flag.
   HRESULT hr = module.DllUnregisterServer();
   return hr;
 }
diff --git a/ceee/installer_dll/installer_helper.cc b/ceee/installer_dll/installer_helper.cc
index 003bb9f..f20c8e8 100644
--- a/ceee/installer_dll/installer_helper.cc
+++ b/ceee/installer_dll/installer_helper.cc
@@ -298,7 +298,7 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) {
 //
 // This is not the actual entrypoint; see the macro right below this
 // function, which keeps us safe from ever forgetting to check for
-// the --enable-ceee flag.
+// the --ceee flag.
 STDAPI DllRegisterServerImpl(void) {
   HRESULT hr = _AtlModule.DllRegisterServer(FALSE);
 
@@ -351,7 +351,7 @@ CEEE_DEFINE_DLL_REGISTER_SERVER()
 
 // Removes entries from the system registry.
 STDAPI DllUnregisterServer(void) {
-  // We always allow unregistration, even if no --enable-ceee install flag.
+  // We always allow unregistration, even if no --ceee install flag.
   //
   // We also always unregister Firefox components, regardless of whether the
   // --enable-ff-ceee flag is set; unregistration is idempotent.