Temporary workaround to get tests that reference singletons either directly o...

chrome/installer/setup/uninstall.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // This file defines the methods useful for uninstalling Chrome.
 
 #include "chrome/installer/setup/uninstall.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 593 matching lines @@
     // being removed and we know that the DLLs were previously registered.
     // Simplest would be to always register them.
     if (installed_version.get() && !is_chrome) {
       RegisterComDllList(product.package().path().Append(
                              installed_version->GetString()),
                          product.system_level(), false, false);
     }
   }
 
   // Close any Chrome Frame helper processes that may be running.
-  if (InstallUtil::IsChromeFrameProcess()) {
+  if (product.distribution()->GetType() == BrowserDistribution::CHROME_FRAME) {
     VLOG(1) << "Closing the Chrome Frame helper process";
     CloseChromeFrameHelperProcess();
   }
 
   if (!installed_version.get())
     return installer_util::UNINSTALL_SUCCESSFUL;
 
   // Finally delete all the files from Chrome folder after moving setup.exe
   // and the user's Local State to a temp location.
   bool delete_profile = ShouldDeleteProfile(cmd_line, status, product);
@@ skipping 31 matching lines @@
   // Try and delete the preserved local state once the post-install
   // operations are complete.
   if (!backup_state_file.empty())
     file_util::Delete(backup_state_file, false);
 
   return ret;
 }
 
 }  // namespace installer