[chrome/browser/password_manager] favor DCHECK_CURRENTLY_ON for better logs

chrome/browser/password_manager/native_backend_kwallet_x.cc

 // Copyright (c) 2012 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 "chrome/browser/password_manager/native_backend_kwallet_x.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 307 matching lines @@
 
   // This ScopedAllowWait should not be here. http://crbug.com/125331
   base::ThreadRestrictions::ScopedAllowWait allow_wait;
   event.Wait();
   return success;
 }
 
 void NativeBackendKWallet::InitOnDBThread(scoped_refptr<dbus::Bus> optional_bus,
                                           base::WaitableEvent* event,
                                           bool* success) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
+  DCHECK_CURRENTLY_ON(BrowserThread::DB);
   DCHECK(!session_bus_.get());
   if (optional_bus.get()) {
     // The optional_bus parameter is given when this method is called in tests.
     session_bus_ = optional_bus;
   } else {
     // Get a (real) connection to the session bus.
     dbus::Bus::Options options;
     options.bus_type = dbus::Bus::SESSION;
     options.connection_type = dbus::Bus::PRIVATE;
     session_bus_ = new dbus::Bus(options);
   }
   kwallet_proxy_ =
       session_bus_->GetObjectProxy(kKWalletServiceName,
                                    dbus::ObjectPath(kKWalletPath));
   // kwalletd may not be running. If we get a temporary failure initializing it,
   // try to start it and then try again. (Note the short-circuit evaluation.)
   const InitResult result = InitWallet();
   *success = (result == INIT_SUCCESS ||
               (result == TEMPORARY_FAIL &&
                StartKWalletd() && InitWallet() == INIT_SUCCESS));
   event->Signal();
 }
 
 bool NativeBackendKWallet::StartKWalletd() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
+  DCHECK_CURRENTLY_ON(BrowserThread::DB);
   // Sadly kwalletd doesn't use DBus activation, so we have to make a call to
   // klauncher to start it.
   dbus::ObjectProxy* klauncher =
       session_bus_->GetObjectProxy(kKLauncherServiceName,
                                    dbus::ObjectPath(kKLauncherPath));
 
   dbus::MethodCall method_call(kKLauncherInterface,
                                "start_service_by_desktop_name");
   dbus::MessageWriter builder(&method_call);
   std::vector<std::string> empty;
@@ skipping 23 matching lines @@
   if (!error.empty() || ret) {
     LOG(ERROR) << "Error launching kwalletd: error '" << error << "' "
                << " (code " << ret << ")";
     return false;
   }
 
   return true;
 }
 
 NativeBackendKWallet::InitResult NativeBackendKWallet::InitWallet() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
+  DCHECK_CURRENTLY_ON(BrowserThread::DB);
   {
     // Check that KWallet is enabled.
     dbus::MethodCall method_call(kKWalletInterface, "isEnabled");
     scoped_ptr<dbus::Response> response(
         kwallet_proxy_->CallMethodAndBlock(
             &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT));
     if (!response.get()) {
       LOG(ERROR) << "Error contacting kwalletd (isEnabled)";
       return TEMPORARY_FAIL;
     }
@@ skipping 509 matching lines @@
     // 32-bit machines, in case we're reading a 64-bit pickle. (Probably rare,
     // since mostly we expect upgrades, not downgrades, but both are possible.)
     success = DeserializeValueSize(
         signon_realm, iter, version, !size_32, false, &forms);
   }
   UMALogDeserializationStatus(success);
   return forms.Pass();
 }
 
 int NativeBackendKWallet::WalletHandle() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
+  DCHECK_CURRENTLY_ON(BrowserThread::DB);
 
   // Open the wallet.
   // TODO(mdm): Are we leaking these handles? Find out.
   int32_t handle = kInvalidKWalletHandle;
   {
     dbus::MethodCall method_call(kKWalletInterface, "open");
     dbus::MessageWriter builder(&method_call);
     builder.AppendString(wallet_name_);  // wallet
     builder.AppendInt64(0);              // wid
     builder.AppendString(app_name_);     // appid
@@ skipping 67 matching lines @@
   }
 
   return handle;
 }
 
 std::string NativeBackendKWallet::GetProfileSpecificFolderName() const {
   // Originally, the folder name was always just "Chrome Form Data".
   // Now we use it to distinguish passwords for different profiles.
   return base::StringPrintf("%s (%d)", kKWalletFolder, profile_id_);
 }