Improve my last change about informing google update about eula.

- Feedback from ddorwin:
 1- Use the right set of permisions for the reg key
 2- Only touch the key if user acepted the eula

BUG=1594565

Review URL: http://codereview.chromium.org/42168

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11610 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 3 insertions, 2 deletions

diff --git a/chrome/installer/setup/main.cc b/chrome/installer/setup/main.cc
index c88d289..9db35e0 100644
--- a/chrome/installer/setup/main.cc
+++ b/chrome/installer/setup/main.cc
@@ -546,7 +546,8 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE prev_instance,
   // then the dialog is shown and regardless of the outcome setup exits here.
   if (parsed_command_line.HasSwitch(installer_util::switches::kShowEula)) {
     installer_util::InstallStatus eula = ShowEULADialog();
-    GoogleUpdateSettings::SetEULAConsent(installer_util::EULA_REJECTED != eula);
+    if (installer_util::EULA_REJECTED != eula)
+      GoogleUpdateSettings::SetEULAConsent(true);
     return eula;
   }
 
diff --git a/chrome/installer/util/google_update_settings.cc b/chrome/installer/util/google_update_settings.cc
index 4e04c3f..8da8adc 100644
--- a/chrome/installer/util/google_update_settings.cc
+++ b/chrome/installer/util/google_update_settings.cc
@@ -59,7 +59,7 @@ bool GoogleUpdateSettings::SetCollectStatsConsent(bool consented) {
 
 bool GoogleUpdateSettings::SetEULAConsent(bool consented) {
   std::wstring reg_path = GetClientStateKeyPath(true);
-  RegKey key(HKEY_LOCAL_MACHINE, reg_path.c_str(), KEY_READ | KEY_WRITE);
+  RegKey key(HKEY_LOCAL_MACHINE, reg_path.c_str(), KEY_READ | KEY_SET_VALUE);
   return key.WriteValue(google_update::kRegEULAAceptedField, consented? 1 : 0);
 }