Fix DCHECK in GCF quick-enable.

chrome/installer/util/installer_state.cc

Index: chrome/installer/util/installer_state.cc
diff --git a/chrome/installer/util/installer_state.cc b/chrome/installer/util/installer_state.cc
index b0a3dae88c3d43a6ad2c58694691379010e178bb..ba0740d7f9189156044f4f1c7cae1f35ed728e8a 100644
--- a/chrome/installer/util/installer_state.cc
+++ b/chrome/installer/util/installer_state.cc
@@ -76,8 +76,7 @@ InstallerState::InstallerState()
       state_type_(BrowserDistribution::CHROME_BROWSER),
       root_key_(NULL),
       msi_(false),
-      verbose_logging_(false),
-      is_chrome_frame_running_(false) {
+      verbose_logging_(false) {
 }
 
 InstallerState::InstallerState(Level level)
@@ -88,8 +87,7 @@ InstallerState::InstallerState(Level level)
       state_type_(BrowserDistribution::CHROME_BROWSER),
       root_key_(NULL),
       msi_(false),
-      verbose_logging_(false),
-      is_chrome_frame_running_(false) {
+      verbose_logging_(false) {
   // Use set_level() so that root_key_ is updated properly.
   set_level(level);
 }
@@ -158,8 +156,6 @@ void InstallerState::Initialize(const CommandLine& command_line,
 
   state_key_ = operand->GetStateKey();
   state_type_ = operand->GetType();
-
-  is_chrome_frame_running_ = DetectChromeFrameInUse(machine_state);
 }
 
 void InstallerState::set_level(Level level) {
@@ -417,22 +413,8 @@ Version* InstallerState::GetCurrentVersion(
   return current_version.release();
 }
 
-FilePath InstallerState::GetInstallerDirectory(const Version& version) const {
-  return target_path().Append(ASCIIToWide(version.GetString()))
-      .Append(kInstallerDir);
-}
-
-// static
-bool InstallerState::IsFileInUse(const FilePath& file) {
-  // Call CreateFile with a share mode of 0 which should cause this to fail
-  // with ERROR_SHARING_VIOLATION if the file exists and is in-use.
-  return !base::win::ScopedHandle(CreateFile(file.value().c_str(),
-                                             GENERIC_WRITE, 0, NULL,
-                                             OPEN_EXISTING, 0, 0)).IsValid();
-}
-
-bool InstallerState::DetectChromeFrameInUse(
-    const InstallationState& machine_state) {
+bool InstallerState::IsChromeFrameRunning(
+    const InstallationState& machine_state) const {
   // We check only for the current version (e.g. the version we are upgrading
   // _from_). We don't need to check interstitial versions if any (as would
   // occur in the case of multiple updates) since if they are in use, we are
@@ -448,6 +430,20 @@ bool InstallerState::DetectChromeFrameInUse(
   return in_use;
 }
 
+FilePath InstallerState::GetInstallerDirectory(const Version& version) const {
+  return target_path().Append(ASCIIToWide(version.GetString()))
+      .Append(kInstallerDir);
+}
+
+// static
+bool InstallerState::IsFileInUse(const FilePath& file) {
+  // Call CreateFile with a share mode of 0 which should cause this to fail
+  // with ERROR_SHARING_VIOLATION if the file exists and is in-use.
+  return !base::win::ScopedHandle(CreateFile(file.value().c_str(),
+                                             GENERIC_WRITE, 0, NULL,
+                                             OPEN_EXISTING, 0, 0)).IsValid();
+}
+
 void InstallerState::RemoveOldVersionDirectories(
     const Version& new_version,
     Version* existing_version,