diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-05 04:59:48 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-05 04:59:48 +0000 |
| commit | 5f2cee8b6e2760e626646651556a808a4cd5a6b1 (patch) | |
| tree | 63d0385a235c5b0ee5cd8eb6d3c429debabfc98d /chrome/test/mini_installer_test | |
| parent | 403fe1585a183e133108e5a1564226e4f7654143 (diff) | |
| download | chromium_src-5f2cee8b6e2760e626646651556a808a4cd5a6b1.zip chromium_src-5f2cee8b6e2760e626646651556a808a4cd5a6b1.tar.gz chromium_src-5f2cee8b6e2760e626646651556a808a4cd5a6b1.tar.bz2 | |
Push the Omaha app guid into the browser distribution classes to remove compile-time differences between Chrome Frame and Chrome.
Review URL: http://codereview.chromium.org/361023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31073 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/mini_installer_test')
| -rw-r--r-- | chrome/test/mini_installer_test/chrome_mini_installer.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/chrome/test/mini_installer_test/chrome_mini_installer.cc b/chrome/test/mini_installer_test/chrome_mini_installer.cc index 58afed3..26dacd4 100644 --- a/chrome/test/mini_installer_test/chrome_mini_installer.cc +++ b/chrome/test/mini_installer_test/chrome_mini_installer.cc @@ -173,9 +173,11 @@ void ChromeMiniInstaller::InstallMetaInstaller() { std::wstring chrome_google_update_state_key( google_update::kRegPathClients); chrome_google_update_state_key.append(L"\\"); - chrome_google_update_state_key.append(google_update::kChromeGuid); - ASSERT_TRUE(CheckRegistryKey(chrome_google_update_state_key)); + BrowserDistribution* dist = BrowserDistribution::GetDistribution(); + chrome_google_update_state_key.append(dist->GetAppGuid()); + + ASSERT_TRUE(CheckRegistryKey(chrome_google_update_state_key)); ASSERT_TRUE(CheckRegistryKey(dist->GetVersionKey())); FindChromeShortcut(); LaunchAndCloseChrome(false); @@ -404,7 +406,10 @@ void ChromeMiniInstaller::DeleteUserDataFolder() { void ChromeMiniInstaller::DeletePvRegistryKey() { std::wstring pv_key(google_update::kRegPathClients); pv_key.append(L"\\"); - pv_key.append(google_update::kChromeGuid); + + BrowserDistribution* dist = BrowserDistribution::GetDistribution(); + pv_key.append(dist->GetAppGuid()); + RegKey key; if (key.Open(GetRootRegistryKey(), pv_key.c_str(), KEY_ALL_ACCESS)) ASSERT_TRUE(key.DeleteValue(L"pv")); |