base: Remove the string logging from CHECK().

chrome/browser/ui/toolbar/toolbar_actions_bar.cc

 // Copyright 2014 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/ui/toolbar/toolbar_actions_bar.h"
 
 #include <utility>
 
 #include "base/auto_reset.h"
 #include "base/location.h"
@@ skipping 40 matching lines @@
 // |equal| is used to compare the elements of |to_sort| and |reference|.
 // This allows us to sort a vector to match another vector of two different
 // types without needing to construct a more cumbersome comparator class.
 // |FunctionType| should equate to (something similar to)
 // bool Equal(const Type1&, const Type2&), but we can't enforce this
 // because of MSVC compilation limitations.
 template<typename Type1, typename Type2, typename FunctionType>
 void SortContainer(std::vector<Type1>* to_sort,
                    const std::vector<Type2>& reference,
                    FunctionType equal) {
-  CHECK_GE(to_sort->size(), reference.size()) <<
-      "|to_sort| must contain all elements in |reference|.";
+  // |to_sort| must contain all elements in |reference|.
+  CHECK_GE(to_sort->size(), reference.size());
   if (reference.empty())
     return;
   // Run through the each element and compare it to the reference. If something
   // is out of place, find the correct spot for it.
   for (size_t i = 0; i < reference.size() - 1; ++i) {
     if (!equal(to_sort->at(i), reference[i])) {
       // Find the correct index (it's guaranteed to be after our current
       // index, since everything up to this point is correct), and swap.
       size_t j = i + 1;
       while (!equal(to_sort->at(j), reference[i])) {
@@ skipping 534 matching lines @@
 // static
 void ToolbarActionsBar::set_extension_bubble_appearance_wait_time_for_testing(
     int time_in_seconds) {
   g_extension_bubble_appearance_wait_time_in_seconds = time_in_seconds;
 }
 
 void ToolbarActionsBar::OnToolbarActionAdded(
     const ToolbarActionsModel::ToolbarItem& item,
     int index) {
   CHECK(model_->actions_initialized());
-  CHECK(GetActionForId(item.id) == nullptr)
-      << "Asked to add a toolbar action view for an action that already "
-         "exists";
+  // Asked to add a toolbar action view for an action that already exists
+  CHECK(GetActionForId(item.id) == nullptr);
 
   toolbar_actions_.insert(toolbar_actions_.begin() + index,
                           model_->CreateActionForItem(browser_, this, item));
   delegate_->AddViewForAction(toolbar_actions_[index], index);
 
   // We may need to resize (e.g. to show the new icon, or the chevron). We don't
   // need to check if an extension is upgrading here, because ResizeDelegate()
   // checks to see if the container is already the proper size, and because
   // if the action is newly incognito enabled, even though it's a reload, it's
   // a new extension to this toolbar.
@@ skipping 172 matching lines @@
   for (ToolbarActionViewController* action : toolbar_actions_) {
     if (action->GetId() == action_id)
       return action;
   }
   return nullptr;
 }
 
 content::WebContents* ToolbarActionsBar::GetCurrentWebContents() {
   return browser_->tab_strip_model()->GetActiveWebContents();
 }