base: Remove the string logging from CHECK().

chromeos/dbus/shill_device_client.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 "chromeos/dbus/shill_device_client.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 18 matching lines @@
       : bus_(NULL) {
   }
 
   ~ShillDeviceClientImpl() override {
     for (HelperMap::iterator iter = helpers_.begin();
          iter != helpers_.end(); ++iter) {
       // This *should* never happen, yet we're getting crash reports that
       // seem to imply that it does happen sometimes.  Adding CHECKs here
       // so we can determine more accurately where the problem lies.
       // See: http://crbug.com/170541
-      CHECK(iter->second) << "NULL Helper found in helper list.";
+      // NULL Helper found in helper list.
+      CHECK(iter->second);
       delete iter->second;
     }
     helpers_.clear();
   }
 
   ///////////////////////////////////////
   // ShillDeviceClient overrides.
   void AddPropertyChangedObserver(
       const dbus::ObjectPath& device_path,
       ShillPropertyChangedObserver* observer) override {
@@ skipping 209 matching lines @@
  protected:
   void Init(dbus::Bus* bus) override { bus_ = bus; }
 
  private:
   typedef std::map<std::string, ShillClientHelper*> HelperMap;
 
   // Returns the corresponding ShillClientHelper for the profile.
   ShillClientHelper* GetHelper(const dbus::ObjectPath& device_path) {
     HelperMap::iterator it = helpers_.find(device_path.value());
     if (it != helpers_.end()) {
-      CHECK(it->second) << "Found a NULL helper in the list.";
+      // Found a NULL helper in the list.
+      CHECK(it->second);
       return it->second;
     }
 
     // There is no helper for the profile, create it.
     dbus::ObjectProxy* object_proxy =
         bus_->GetObjectProxy(shill::kFlimflamServiceName, device_path);
     ShillClientHelper* helper = new ShillClientHelper(object_proxy);
-    CHECK(helper) << "Unable to create Shill client helper.";
+    // Unable to create Shill client helper.
+    CHECK(helper);
     helper->MonitorPropertyChanged(shill::kFlimflamDeviceInterface);
     helpers_.insert(HelperMap::value_type(device_path.value(), helper));
     return helper;
   }
 
   dbus::Bus* bus_;
   HelperMap helpers_;
 
   DISALLOW_COPY_AND_ASSIGN(ShillDeviceClientImpl);
 };
 
 }  // namespace
 
 ShillDeviceClient::ShillDeviceClient() {}
 
 ShillDeviceClient::~ShillDeviceClient() {}
 
 // static
 ShillDeviceClient* ShillDeviceClient::Create() {
   return new ShillDeviceClientImpl();
 }
 
 }  // namespace chromeos