aw: Use comparison DCHECKs where appropriate

android_webview/renderer/print_web_view_helper.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.
 
 // TODO(sgurun) copied from chrome/renderer. Remove after crbug.com/322276
 
 #include "android_webview/renderer/print_web_view_helper.h"
 
 #include <string>
 
@@ skipping 123 matching lines @@
                                       margin_left_in_pixels);
   }
 
   int new_content_width = page_size_in_pixels.width -
                           margin_left_in_pixels - margin_right_in_pixels;
   int new_content_height = page_size_in_pixels.height -
                            margin_top_in_pixels - margin_bottom_in_pixels;
 
   // Invalid page size and/or margins. We just use the default setting.
   if (new_content_width < 1 || new_content_height < 1) {
-    CHECK(frame != NULL);
+    CHECK(frame);
     page_css_params = GetCssPrintParams(NULL, page_index, page_params);
     return page_css_params;
   }
 
   page_css_params.content_size = gfx::Size(
       ConvertUnit(new_content_width, kPixelsPerInch, dpi),
       ConvertUnit(new_content_height, kPixelsPerInch, dpi));
 
   if (original_page_size_in_pixels != page_size_in_pixels) {
     page_css_params.page_size = gfx::Size(
@@ skipping 1809 matching lines @@
   DCHECK_EQ(INITIALIZED, state_);
   generate_draft_pages_ = generate_draft_pages;
 }
 
 void PrintWebViewHelper::PrintPreviewContext::set_error(
     enum PrintPreviewErrorBuckets error) {
   error_ = error;
 }
 
 blink::WebLocalFrame* PrintWebViewHelper::PrintPreviewContext::source_frame() {
-  DCHECK(state_ != UNINITIALIZED);
+  DCHECK_NE(UNINITIALIZED, state_);
   return source_frame_.GetFrame();
 }
 
 const blink::WebNode&
     PrintWebViewHelper::PrintPreviewContext::source_node() const {
-  DCHECK(state_ != UNINITIALIZED);
+  DCHECK_NE(UNINITIALIZED, state_);
   return source_node_;
 }
 
 blink::WebLocalFrame*
 PrintWebViewHelper::PrintPreviewContext::prepared_frame() {
-  DCHECK(state_ != UNINITIALIZED);
+  DCHECK_NE(UNINITIALIZED, state_);
   return prep_frame_view_->frame();
 }
 
 const blink::WebNode&
     PrintWebViewHelper::PrintPreviewContext::prepared_node() const {
-  DCHECK(state_ != UNINITIALIZED);
+  DCHECK_NE(UNINITIALIZED, state_);
   return prep_frame_view_->node();
 }
 
 int PrintWebViewHelper::PrintPreviewContext::total_page_count() const {
-  DCHECK(state_ != UNINITIALIZED);
+  DCHECK_NE(UNINITIALIZED, state_);
   return total_page_count_;
 }
 
 bool PrintWebViewHelper::PrintPreviewContext::generate_draft_pages() const {
   return generate_draft_pages_;
 }
 
 PreviewMetafile* PrintWebViewHelper::PrintPreviewContext::metafile() {
   DCHECK(IsRendering());
   return metafile_.get();
 }
 
 int PrintWebViewHelper::PrintPreviewContext::last_error() const {
   return error_;
 }
 
 gfx::Size PrintWebViewHelper::PrintPreviewContext::GetPrintCanvasSize() const {
   DCHECK(IsRendering());
   return prep_frame_view_->GetPrintCanvasSize();
 }
 
 void PrintWebViewHelper::PrintPreviewContext::ClearContext() {
   prep_frame_view_.reset();
   metafile_.reset();
   pages_to_render_.clear();
   error_ = PREVIEW_ERROR_NONE;
 }
 
 }  // namespace printing