Merge 242400 "Remove installation of Chrome Frame."

chrome/app/google_chrome_strings.grd

Index: chrome/app/google_chrome_strings.grd
===================================================================
--- chrome/app/google_chrome_strings.grd	(revision 243928)
+++ chrome/app/google_chrome_strings.grd	(working copy)
@@ -442,12 +442,6 @@
       <message name="IDS_INSTALL_HIGHER_VERSION_APP_LAUNCHER" desc="Error displayed when higher version of the Chrome App Launcher already exists.">
         This computer already has a more recent version of the Google Chrome components. Please use a more recent installer.
       </message>
-      <message name="IDS_INSTALL_HIGHER_VERSION_CF" desc="Error displayed when higher version of Chrome Frame already exists">
-        This computer already has a more recent version of Google Chrome Frame. If the software is not working, please uninstall Google Chrome Frame and try again.
-      </message>
-      <message name="IDS_INSTALL_HIGHER_VERSION_CB_CF" desc="Error displayed when higher version of Chrome and Chrome Frame already exists">
-        This computer already has a more recent version of Google Chrome and Google Chrome Frame. If the software is not working, please uninstall both Google Chrome and Google Chrome Frame and try again.
-      </message>
       <message name="IDS_INSTALL_SYSTEM_LEVEL_EXISTS" desc="Error displayed during user level install if system level Chrome Frame is already installed.">
         Google Chrome Frame is already installed and available to all users of this computer. If you want to install Google Chrome Frame at the user level, you must first uninstall the system-level version installed by an administrator.
       </message>
@@ -457,9 +451,6 @@
       <message name="IDS_SAME_VERSION_REPAIR_FAILED" desc="Error displayed if installation fails due to Chrome running.">
         Can not install the same Google Chrome version that is currently running. Please close Google Chrome and try again.
       </message>
-      <message name="IDS_SAME_VERSION_REPAIR_FAILED_CF" desc="Error displayed if installation fails due to Chrome Frame already running.">
-        Can not install the same Google Chrome Frame version that is currently running. Please close Google Chrome Frame and try again.
-      </message>
       <message name="IDS_SETUP_PATCH_FAILED" desc="Error message when setup.exe fails to patch itself.">
         Installation failed due to unspecified error. Please download Google Chrome again.
       </message>