More installer refactoring in the interest of fixing some bugs and cleaning t...

chrome_frame/ready_mode/ready_mode.cc

Index: chrome_frame/ready_mode/ready_mode.cc
===================================================================
--- chrome_frame/ready_mode/ready_mode.cc	(revision 71802)
+++ chrome_frame/ready_mode/ready_mode.cc	(working copy)
@@ -15,8 +15,8 @@
 #include "base/win/scoped_bstr.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/win_util.h"
+#include "chrome/installer/util/browser_distribution.h"
 #include "net/base/registry_controlled_domain.h"
-#include "chrome/installer/util/package_properties.h"
 #include "chrome_frame/infobars/infobar_manager.h"
 #include "chrome_frame/ready_mode/internal/ready_mode_web_browser_adapter.h"
 #include "chrome_frame/ready_mode/internal/ready_prompt_content.h"
@@ -192,11 +192,13 @@
     scoped_ptr<RegistryReadyModeState::Observer> ready_mode_state_observer(
         new StateObserver(weak_ptr_factory_.GetWeakPtr()));
 
-    installer::ActivePackageProperties package_properties;
+    BrowserDistribution* dist =
+        BrowserDistribution::GetSpecificDistribution(
+            BrowserDistribution::CHROME_BINARIES);
 
     // Owned by infobar_content
     scoped_ptr<ReadyModeState> ready_mode_state(new RegistryReadyModeState(
-        package_properties.GetStateKey(),
+        dist->GetStateKey(),
         base::TimeDelta::FromMinutes(kTemporaryDeclineDurationMinutes),
         ready_mode_state_observer.release()));
 
@@ -329,9 +331,12 @@
   // Take ownership of the delegate
   linked_ptr<Delegate> delegate(chrome_frame);
   chrome_frame = NULL;
+    BrowserDistribution* dist =
+        BrowserDistribution::GetSpecificDistribution(
+            BrowserDistribution::CHROME_BINARIES);
 
   RegistryReadyModeState ready_mode_state(
-      installer::ActivePackageProperties().GetStateKey(),
+      dist->GetStateKey(),
       base::TimeDelta::FromMinutes(kTemporaryDeclineDurationMinutes),
       NULL);  // NULL => no observer required