Regkey functions return error code instead of bool

chrome/browser/background_mode_manager_win.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.
 
 #include "app/l10n_util.h"
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 20 matching lines @@
 const wchar_t* kBackgroundModeRegistrySubkey =
     L"Software\\Microsoft\\Windows\\CurrentVersion\\Run";
 const wchar_t* kBackgroundModeRegistryKeyName = L"chromium";
 
 void DisableLaunchOnStartupTask::Run() {
   const wchar_t* key_name = kBackgroundModeRegistryKeyName;
   base::win::RegKey read_key(kBackgroundModeRegistryRootKey,
                              kBackgroundModeRegistrySubkey, KEY_READ);
   base::win::RegKey write_key(kBackgroundModeRegistryRootKey,
                               kBackgroundModeRegistrySubkey, KEY_WRITE);
-  if (read_key.ValueExists(key_name) && !write_key.DeleteValue(key_name))
-    NOTREACHED() << "Failed to deregister launch on login.";
+  if (read_key.ValueExists(key_name)) {
+    LONG result = write_key.DeleteValue(key_name);
+    if (result != ERROR_SUCCESS)

[grt (UTC plus 2), 2011/01/11 03:51:30]

DCHECK_EQ(ERROR_SUCCESS, result) << "Failed..." << com::LogWe(result);

[amit, 2011/01/12 04:11:23]

Done.

+      NOTREACHED() << "Failed to deregister launch on login. error: " << result;
+  }
 }
 
 void EnableLaunchOnStartupTask::Run() {
   // TODO(rickcam): Bug 53597: Make RegKey mockable.
   // TODO(rickcam): Bug 53600: Use distinct registry keys per flavor+profile.
   const wchar_t* key_name = kBackgroundModeRegistryKeyName;
   base::win::RegKey read_key(kBackgroundModeRegistryRootKey,
                              kBackgroundModeRegistrySubkey, KEY_READ);
   base::win::RegKey write_key(kBackgroundModeRegistryRootKey,
                               kBackgroundModeRegistrySubkey, KEY_WRITE);
   FilePath executable;
   if (!PathService::Get(base::FILE_EXE, &executable))
     return;
   std::wstring new_value = executable.value() + L" --no-startup-window";
   if (read_key.ValueExists(key_name)) {
     std::wstring current_value;
-    if (read_key.ReadValue(key_name, &current_value) &&
+    if ((read_key.ReadValue(key_name, &current_value) == ERROR_SUCCESS) &&
         (current_value == new_value)) {
       return;
     }
   }
-  if (!write_key.WriteValue(key_name, new_value.c_str()))
-    NOTREACHED() << "Failed to register launch on login.";
+  LONG result = write_key.WriteValue(key_name, new_value.c_str());
+  if (result != ERROR_SUCCESS)

[grt (UTC plus 2), 2011/01/11 03:51:30]

DCHECK_EQ as above

[amit, 2011/01/12 04:11:23]

Done.

+    NOTREACHED() << "Failed to register launch on login. Error: " << result;
 }
 
 }  // namespace
 
 void BackgroundModeManager::EnableLaunchOnStartup(bool should_launch) {
   // This functionality is only defined for default profile, currently.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUserDataDir))
     return;
   if (should_launch) {
     BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
                             new EnableLaunchOnStartupTask());
   } else {
     BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
                             new DisableLaunchOnStartupTask());
   }
 }
 
 string16 BackgroundModeManager::GetPreferencesMenuLabel() {
   return l10n_util::GetStringUTF16(IDS_OPTIONS);
 }