Fix a FORWARD_NULL defect reported by Coverity....

views/controls/scroll_view.cc

 // Copyright (c) 2006-2008 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 "views/controls/scroll_view.h"
 
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "views/controls/scrollbar/native_scroll_bar.h"
 #include "views/widget/root_view.h"
@@ skipping 243 matching lines @@
     // This is no op if bounds are the same
     contents_->SetBounds(-x, -y, contents_->width(), contents_->height());
   }
 }
 
 gfx::Rect ScrollView::GetVisibleRect() const {
   if (!contents_)
     return gfx::Rect();
 
   const int x =
-      (horiz_sb_ && horiz_sb_->IsVisible()) ? horiz_sb_->GetPosition() : 0;
+      horiz_sb_->IsVisible() ? horiz_sb_->GetPosition() : 0;
   const int y =
-      (vert_sb_ && vert_sb_->IsVisible()) ? vert_sb_->GetPosition() : 0;
+      vert_sb_->IsVisible() ? vert_sb_->GetPosition() : 0;
   return gfx::Rect(x, y, viewport_->width(), viewport_->height());
 }
 
 void ScrollView::ScrollContentsRegionToBeVisible(int x,
                                                  int y,
                                                  int width,
                                                  int height) {
-  if (!contents_ || ((!horiz_sb_ || !horiz_sb_->IsVisible()) &&
-                     (!vert_sb_ || !vert_sb_->IsVisible()))) {
+  if (!contents_ || (!horiz_sb_->IsVisible() && !vert_sb_->IsVisible()))
     return;
-  }
 
   // Figure out the maximums for this scroll view.
   const int contents_max_x =
       std::max(viewport_->width(), contents_->width());
   const int contents_max_y =
       std::max(viewport_->height(), contents_->height());
 
   // Make sure x and y are within the bounds of [0,contents_max_*].
   x = std::max(0, std::min(contents_max_x, x));
   y = std::max(0, std::min(contents_max_y, y));
@@ skipping 42 matching lines @@
     horiz_sb_->Update(vw, cw, -origin);
   }
   if (vert_sb_->IsVisible()) {
     int vh = viewport_->height();
     int ch = contents_->height();
     int origin = contents_->y();
     vert_sb_->Update(vh, ch, -origin);
   }
 }
 
-// TODO(ACW). We should really use ScrollWindowEx as needed
+// TODO(ACW): We should really use ScrollWindowEx as needed
 void ScrollView::ScrollToPosition(ScrollBar* source, int position) {
   if (!contents_)
     return;
 
   if (source == horiz_sb_ && horiz_sb_->IsVisible()) {
     int vw = viewport_->width();
     int cw = contents_->width();
     int origin = contents_->x();
     if (-origin != position) {
       int max_pos = std::max(0, cw - vw);
@@ skipping 144 matching lines @@
   return controller_->GetRowInfo(y);
 }
 
 // FixedRowHeightScrollHelper -----------------------------------------------
 
 FixedRowHeightScrollHelper::FixedRowHeightScrollHelper(int top_margin,
                                                        int row_height)
     : VariableRowHeightScrollHelper(NULL),
       top_margin_(top_margin),
       row_height_(row_height) {
-  DCHECK(row_height > 0);
+  DCHECK_GT(row_height, 0);
 }
 
 VariableRowHeightScrollHelper::RowInfo
     FixedRowHeightScrollHelper::GetRowInfo(int y) {
   if (y < top_margin_)
     return RowInfo(0, top_margin_);
   return RowInfo((y - top_margin_) / row_height_ * row_height_ + top_margin_,
                  row_height_);
 }
 
 }  // namespace views