diff options
Diffstat (limited to 'chrome/browser/automation')
7 files changed, 12 insertions, 12 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index e5091f3..a114816 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -838,7 +838,7 @@ void AutomationProvider::GetEnabledExtensions( void AutomationProvider::WaitForExtensionTestResult( IPC::Message* reply_message) { - DCHECK(reply_message_ == NULL); + DCHECK(!reply_message_); reply_message_ = reply_message; // Call MaybeSendResult, because the result might have come in before // we were waiting on it. diff --git a/chrome/browser/automation/automation_resource_message_filter.cc b/chrome/browser/automation/automation_resource_message_filter.cc index 8fc76a6..e029bf0 100644 --- a/chrome/browser/automation/automation_resource_message_filter.cc +++ b/chrome/browser/automation/automation_resource_message_filter.cc @@ -121,7 +121,7 @@ AutomationResourceMessageFilter::~AutomationResourceMessageFilter() { // Called on the IPC thread: void AutomationResourceMessageFilter::OnFilterAdded(IPC::Channel* channel) { - DCHECK(channel_ == NULL); + DCHECK(!channel_); channel_ = channel; } diff --git a/chrome/browser/automation/automation_resource_tracker.cc b/chrome/browser/automation/automation_resource_tracker.cc index 82c384a..09e0ed2 100644 --- a/chrome/browser/automation/automation_resource_tracker.cc +++ b/chrome/browser/automation/automation_resource_tracker.cc @@ -34,7 +34,7 @@ void AutomationResourceTrackerImpl::RemoveImpl(const void* resource) { return; int handle = resource_to_handle_[resource]; - DCHECK(handle_to_resource_[handle] == resource); + DCHECK_EQ(handle_to_resource_[handle], resource); RemoveObserverTypeProxy(resource); diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index 139143c..4d96cbe 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -720,7 +720,7 @@ void TestingAutomationProvider::GetRedirectsFrom(int tab_handle, 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 @@ -1139,7 +1139,7 @@ void TestingAutomationProvider::ExecuteJavascript( "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( @@ -1163,7 +1163,7 @@ 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( @@ -4642,7 +4642,7 @@ void TestingAutomationProvider::OnRedirectQueryComplete( 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; diff --git a/chrome/browser/automation/ui_controls_linux.cc b/chrome/browser/automation/ui_controls_linux.cc index 97649ee..4748612 100644 --- a/chrome/browser/automation/ui_controls_linux.cc +++ b/chrome/browser/automation/ui_controls_linux.cc @@ -98,7 +98,7 @@ namespace ui_controls { bool SendKeyPress(gfx::NativeWindow window, ui::KeyboardCode key, bool control, bool shift, bool alt, bool command) { - DCHECK(command == false); // No command key on Linux + DCHECK_EQ(command, false); // No command key on Linux GdkWindow* event_window = NULL; GtkWidget* grab_widget = gtk_grab_get_current(); if (grab_widget) { @@ -140,7 +140,7 @@ bool SendKeyPressNotifyWhenDone(gfx::NativeWindow window, bool control, bool shift, bool alt, bool command, Task* task) { - DCHECK(command == false); // No command key on Linux + DCHECK_EQ(command, false); // No command key on Linux int release_count = 1; if (control) release_count++; diff --git a/chrome/browser/automation/ui_controls_win.cc b/chrome/browser/automation/ui_controls_win.cc index 127ea6d..662ff63 100644 --- a/chrome/browser/automation/ui_controls_win.cc +++ b/chrome/browser/automation/ui_controls_win.cc @@ -327,7 +327,7 @@ bool SendMouseEventsImpl(MouseButton type, int state, Task* task) { bool SendKeyPress(gfx::NativeWindow window, ui::KeyboardCode key, bool control, bool shift, bool alt, bool command) { - DCHECK(command == false); // No command key on Windows + DCHECK_EQ(command, false); // No command key on Windows return SendKeyPressImpl(key, control, shift, alt, NULL); } @@ -336,7 +336,7 @@ bool SendKeyPressNotifyWhenDone(gfx::NativeWindow window, bool control, bool shift, bool alt, bool command, Task* task) { - DCHECK(command == false); // No command key on Windows + DCHECK_EQ(command, false); // No command key on Windows return SendKeyPressImpl(key, control, shift, alt, task); } diff --git a/chrome/browser/automation/url_request_automation_job.cc b/chrome/browser/automation/url_request_automation_job.cc index cd5db32..0d06a0e 100644 --- a/chrome/browser/automation/url_request_automation_job.cc +++ b/chrome/browser/automation/url_request_automation_job.cc @@ -376,7 +376,7 @@ void URLRequestAutomationJob::Cleanup() { id_ = 0; tab_ = 0; - DCHECK(message_filter_ == NULL); + DCHECK(!message_filter_); DisconnectFromMessageFilter(); pending_buf_ = NULL; |