favor DCHECK_CURRENTLY_ON for better logs in components/ (part 2)

components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "components/navigation_interception/intercept_navigation_resource_throttle.h"
@@ skipping 101 matching lines @@
                     int render_process_id,
                     int render_frame_id,
                     const std::string& request_method,
                     RedirectMode redirect_mode,
                     MockInterceptCallbackReceiver* callback_receiver)
       : resource_context_(&test_url_request_context_),
         request_(resource_context_.GetRequestContext()->CreateRequest(
                      url,
                      net::DEFAULT_PRIORITY,
                      NULL /* delegate */)) {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
     if (render_process_id != MSG_ROUTING_NONE &&
         render_frame_id != MSG_ROUTING_NONE) {
       content::ResourceRequestInfo::AllocateForTesting(
           request_.get(),
           content::RESOURCE_TYPE_MAIN_FRAME,
           &resource_context_,
           render_process_id,
           MSG_ROUTING_NONE,
           render_frame_id,
           true,    // is_main_frame
@@ skipping 10 matching lines @@
 
     if (redirect_mode == REDIRECT_MODE_302) {
       net::HttpResponseInfo& response_info =
           const_cast<net::HttpResponseInfo&>(request_->response_info());
       response_info.headers = new net::HttpResponseHeaders(
           "Status: 302 Found\0\0");
     }
   }
 
   void ThrottleWillStartRequest(bool* defer) {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
     throttle_->WillStartRequest(defer);
   }
 
   void ThrottleWillRedirectRequest(const net::RedirectInfo& redirect_info,
                                    bool* defer) {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
     throttle_->WillRedirectRequest(redirect_info, defer);
   }
 
   bool request_resumed() const {
     return throttle_controller_.status() ==
         MockResourceController::RESUMED;
   }
 
   bool request_cancelled() const {
     return throttle_controller_.status() ==
@@ skipping 34 matching lines @@
     io_thread_state_ = io_thread_state;
   }
 
   void RunThrottleWillStartRequestOnIOThread(
       const GURL& url,
       const std::string& request_method,
       RedirectMode redirect_mode,
       int render_process_id,
       int render_frame_id,
       bool* defer) {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
     TestIOThreadState* io_thread_state =
         new TestIOThreadState(url, render_process_id, render_frame_id,
                               request_method, redirect_mode,
                               mock_callback_receiver_.get());
 
     SetIOThreadState(io_thread_state);
 
     if (redirect_mode == REDIRECT_MODE_NO_REDIRECT) {
       io_thread_state->ThrottleWillStartRequest(defer);
     } else {
@@ skipping 247 matching lines @@
           REDIRECT_MODE_302,
           web_contents()->GetRenderViewHost()->GetProcess()->GetID(),
           web_contents()->GetMainFrame()->GetRoutingID(),
           base::Unretained(&defer)));
 
   // Wait for the request to finish processing.
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace navigation_interception