1 files changed, 16 insertions, 10 deletions
diff --git a/chrome/installer/util/product_unittest.cc b/chrome/installer/util/product_unittest.cc
index 0e928bc..b6f8f27 100644
--- a/chrome/installer/util/product_unittest.cc
+++ b/chrome/installer/util/product_unittest.cc
@@ -9,6 +9,7 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/installer/util/chrome_frame_distribution.h"
 #include "chrome/installer/util/google_update_constants.h"
+#include "chrome/installer/util/installation_state.h"
 #include "chrome/installer/util/package.h"
 #include "chrome/installer/util/package_properties.h"
 #include "chrome/installer/util/master_preferences.h"
@@ -126,8 +127,12 @@ TEST_F(ProductTest, ProductInstallBasic) {
     EXPECT_TRUE(product->IsMsi());
 
     // There should be no installed version in the registry.
-    EXPECT_FALSE(product->IsInstalled());
-    EXPECT_TRUE(product->GetInstalledVersion() == NULL);
+    {
+      installer::InstallationState state;
+      state.Initialize(prefs);
+      EXPECT_TRUE(state.GetProductState(system_level,
+                                        distribution->GetType()) == NULL);
+    }
 
     // Let's pretend chrome is installed.
     RegKey version_key(root, distribution->GetVersionKey().c_str(),
@@ -140,14 +145,15 @@ TEST_F(ProductTest, ProductInstallBasic) {
     version_key.WriteValue(google_update::kRegVersionField,
                            UTF8ToWide(current_version->GetString()).c_str());
 
-    package = new Package(multi_install, system_level, test_dir_.path(),
-                          &properties);
-    product = new Product(distribution, package.get());
-    const Version* installed(product->GetInstalledVersion());
-    EXPECT_TRUE(product->IsInstalled());
-    EXPECT_TRUE(installed != NULL);
-    if (installed) {
-      EXPECT_TRUE(installed->Equals(*current_version.get()));
+    {
+      installer::InstallationState state;
+      state.Initialize(prefs);
+      const installer::ProductState* prod_state =
+          state.GetProductState(system_level, distribution->GetType());
+      EXPECT_TRUE(prod_state != NULL);
+      if (prod_state != NULL) {
+        EXPECT_TRUE(prod_state->version().Equals(*current_version.get()));
+      }
     }
   }
 }