Fix "#if defined(DEBUG)" statements

chrome/browser/ui/views/toolbar/browser_actions_container.cc

 // Copyright 2013 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/views/toolbar/browser_actions_container.h"
 
 #include "base/compiler_specific.h"
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"
 #include "chrome/browser/ui/views/extensions/extension_action_view_controller.h"
 #include "chrome/browser/ui/views/extensions/extension_popup.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/toolbar/browser_actions_container_observer.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/common/extensions/command.h"
 #include "chrome/grit/generated_resources.h"
+#include "components/crx_file/id_util.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/runtime_data.h"
 #include "extensions/common/feature_switch.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/dragdrop/drag_utils.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/nine_image_painter_factory.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 713 matching lines @@
   if (!initialized) {
     initialized = true;
     icon_height = ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
         IDR_BROWSER_ACTION)->height();
   }
   return icon_height;
 }
 
 void BrowserActionsContainer::ToolbarExtensionAdded(const Extension* extension,
                                                     int index) {
-#if defined(DEBUG)
-  for (size_t i = 0; i < browser_action_views_.size(); ++i) {
-    DCHECK(browser_action_views_[i]->extension() != extension) <<
-           "Asked to add a browser action view for an extension that already "
-           "exists.";
-  }
-#endif
+  DCHECK(!GetViewForExtension(extension)) <<
+      "Asked to add a browser action view for an extension that already exists";
   if (chevron_)
     chevron_->CloseMenu();
 
   // Add the new browser action to the vector and the view hierarchy.
   BrowserActionView* view = new BrowserActionView(
       make_scoped_ptr(new ExtensionActionViewController(
           extension,
           browser_,
           extensions::ExtensionActionManager::Get(profile_)->
               GetExtensionAction(*extension))),
@@ skipping 224 matching lines @@
 
 size_t BrowserActionsContainer::GetIconCount() const {
   if (!model_)
     return 0u;
 
   // Find the absolute value for the model's visible count.
   int model_visible_size = model_->GetVisibleIconCount();
   size_t absolute_model_visible_size = model_visible_size == -1 ?
       model_->toolbar_items().size() : model_visible_size;
 
-#if defined(DEBUG)
+#if !defined(NDEBUG)
   // Good time for some sanity checks: We should never try to display more
   // icons than we have, and we should always have a view per item in the model.
   // (The only exception is if this is in initialization.)
   if (initialized_) {
     size_t num_extension_actions = 0u;
-    for (const BrowserActionView* view : browser_action_views_) {
-      num_extension_actions +=
-          view->view_controller()->GetType() ==
-              ToolbarActionViewController::TYPE_EXTENSION_ACTION ? 1 : 0;
+    for (BrowserActionView* view : browser_action_views_) {
+      // No component action should ever have a valid extension id, so we can
+      // use this to check the extension amount.
+      // TODO(devlin): Fix this to just check model size when the model also
+      // includes component actions.
+      if (crx_file::id_util::IdIsValid(view->view_controller()->GetId()))
+        ++num_extension_actions;
     }
-    DCHECK_LE(absolute_model_visible_size, browser_action_views_.size());
-    DCHECK_EQ(model_->toolbar_items().size(), browser_action_views_.size());
+    DCHECK_LE(absolute_model_visible_size, num_extension_actions);
+    DCHECK_EQ(model_->toolbar_items().size(), num_extension_actions);
   }
 #endif
 
   // The overflow displays any icons not shown by the main bar.
   return in_overflow_mode() ?
       model_->toolbar_items().size() - absolute_model_visible_size :
       absolute_model_visible_size;
 }