| Index: chrome/browser/automation/testing_automation_provider.cc
|
| ===================================================================
|
| --- chrome/browser/automation/testing_automation_provider.cc (revision 75286)
|
| +++ chrome/browser/automation/testing_automation_provider.cc (working copy)
|
| @@ -719,7 +719,7 @@
|
| 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
|
| @@ -1138,7 +1138,7 @@
|
| "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(
|
| @@ -1162,7 +1162,7 @@
|
| 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(
|
| @@ -4641,7 +4641,7 @@
|
| 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;
|
|
|