Begun the DCHECK() cleanup. Starting off with /src/chrome/a* and /src/chrome/...

chrome/browser/automation/testing_automation_provider.cc

 // Copyright (c) 2011 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/automation/testing_automation_provider.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 701 matching lines @@
   if (redirect_query_) {
     LOG(ERROR) << "Can only handle one redirect query at once.";
   } else if (tab_tracker_->ContainsHandle(tab_handle)) {
     NavigationController* tab = tab_tracker_->GetResource(tab_handle);
     HistoryService* history_service =
         tab->profile()->GetHistoryService(Profile::EXPLICIT_ACCESS);
 
     DCHECK(history_service) << "Tab " << tab_handle << "'s profile " <<
                                "has no history service";
     if (history_service) {
-      DCHECK(reply_message_ == NULL);
+      DCHECK(!reply_message_);
       reply_message_ = reply_message;
       // Schedule a history query for redirects. The response will be sent
       // asynchronously from the callback the history system uses to notify us
       // that it's done: OnRedirectQueryComplete.
       redirect_query_ = history_service->QueryRedirectsFrom(
           source_url, &consumer_,
           NewCallback(this,
                       &TestingAutomationProvider::OnRedirectQueryComplete));
       return;  // Response will be sent when query completes.
     }
@@ skipping 398 matching lines @@
 
   // Set the routing id of this message with the controller.
   // This routing id needs to be remembered for the reverse
   // communication while sending back the response of
   // this javascript execution.
   std::string set_automation_id;
   base::SStringPrintf(&set_automation_id,
                       "window.domAutomationController.setAutomationId(%d);",
                       reply_message->routing_id());
 
-  DCHECK(reply_message_ == NULL);
+  DCHECK(!reply_message_);
   reply_message_ = reply_message;
 
   tab_contents->render_view_host()->ExecuteJavascriptInWebFrame(
       WideToUTF16Hack(frame_xpath), UTF8ToUTF16(set_automation_id));
   tab_contents->render_view_host()->ExecuteJavascriptInWebFrame(
       WideToUTF16Hack(frame_xpath), WideToUTF16Hack(script));
 }
 
 void TestingAutomationProvider::GetConstrainedWindowCount(int handle,
                                                           int* count) {
   *count = -1;  // -1 is the error code
   if (tab_tracker_->ContainsHandle(handle)) {
     NavigationController* nav_controller = tab_tracker_->GetResource(handle);
     TabContents* tab_contents = nav_controller->tab_contents();
     if (tab_contents)
       *count = static_cast<int>(tab_contents->child_windows_.size());
   }
 }
 
 void TestingAutomationProvider::HandleInspectElementRequest(
     int handle, int x, int y, IPC::Message* reply_message) {
   TabContents* tab_contents = GetTabContentsForHandle(handle, NULL);
   if (tab_contents) {
-    DCHECK(reply_message_ == NULL);
+    DCHECK(!reply_message_);
     reply_message_ = reply_message;
 
     DevToolsManager::GetInstance()->InspectElement(
         tab_contents->render_view_host(), x, y);
   } else {
     AutomationMsg_InspectElement::WriteReplyParams(reply_message, -1);
     Send(reply_message);
   }
 }
 
@@ skipping 3458 matching lines @@
     }
   }
 }
 
 // TODO(brettw) change this to accept GURLs when history supports it
 void TestingAutomationProvider::OnRedirectQueryComplete(
     HistoryService::Handle request_handle,
     GURL from_url,
     bool success,
     history::RedirectList* redirects) {
-  DCHECK(request_handle == redirect_query_);
+  DCHECK_EQ(request_handle, redirect_query_);
   DCHECK(reply_message_ != NULL);
 
   std::vector<GURL> redirects_gurl;
   reply_message_->WriteBool(success);
   if (success) {
     for (size_t i = 0; i < redirects->size(); i++)
       redirects_gurl.push_back(redirects->at(i));
   }
 
   IPC::ParamTraits<std::vector<GURL> >::Write(reply_message_, redirects_gurl);
@@ skipping 15 matching lines @@
     // If you change this, update Observer for NotificationType::SESSION_END
     // below.
     MessageLoop::current()->PostTask(FROM_HERE,
         NewRunnableMethod(this, &TestingAutomationProvider::OnRemoveProvider));
   }
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   AutomationProviderList::GetInstance()->RemoveProvider(this);
 }