favor DCHECK_CURRENTLY_ON for better logs in content/browser/[f-p]*

content/browser/plugin_service_impl_browsertest.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 "content/browser/plugin_service_impl.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/plugin_service_filter.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace content {
 
 const char kNPAPITestPluginMimeType[] = "application/vnd.npapi-test";
 
 void OpenChannel(PluginProcessHost::Client* client) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   // Start opening the channel
   PluginServiceImpl::GetInstance()->OpenChannelToNpapiPlugin(
       0, 0, GURL(), GURL(), kNPAPITestPluginMimeType, client);
 }
 
 // Mock up of the Client and the Listener classes that would supply the
 // communication channel with the plugin.
 class MockPluginProcessHostClient : public PluginProcessHost::Client,
                                     public IPC::Listener {
  public:
@@ skipping 205 matching lines @@
       ResourceContext* context)
       : MockCanceledPluginServiceClient(context),
         set_plugin_info_called_(false),
         on_found_plugin_process_host_called_(false),
         host_(NULL) {}
 
   ~MockCanceledBeforeSentPluginProcessHostClient() override {}
 
   // Client implementation.
   void SetPluginInfo(const WebPluginInfo& info) override {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+    DCHECK_CURRENTLY_ON(BrowserThread::IO);
     ASSERT_TRUE(info.mime_types.size());
     ASSERT_EQ(kNPAPITestPluginMimeType, info.mime_types[0].mime_type);
     set_plugin_info_called_ = true;
   }
   void OnFoundPluginProcessHost(PluginProcessHost* host) override {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+    DCHECK_CURRENTLY_ON(BrowserThread::IO);
     set_on_found_plugin_process_host_called();
     set_host(host);
     // This gets called right before we request the plugin<=>renderer channel,
     // so we have to post a task to cancel it.
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&PluginProcessHost::CancelPendingRequest,
                    base::Unretained(host),
                    this));
     base::MessageLoop::current()->PostTask(
@@ skipping 50 matching lines @@
         on_sent_plugin_channel_request_called_(false) {}
   ~MockCanceledAfterSentPluginProcessHostClient() override {}
 
   // Client implementation.
 
   int ID() override { return 42; }
   bool OffTheRecord() override { return false; }
 
   // We override this guy again since we don't want to cancel yet.
   void OnFoundPluginProcessHost(PluginProcessHost* host) override {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+    DCHECK_CURRENTLY_ON(BrowserThread::IO);
     set_on_found_plugin_process_host_called();
     set_host(host);
   }
 
   void OnSentPluginChannelRequest() override {
     on_sent_plugin_channel_request_called_ = true;
     host()->CancelSentRequest(this);
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE, base::MessageLoop::QuitClosure());
   }
@@ skipping 19 matching lines @@
       BrowserThread::IO, FROM_HERE,
       base::Bind(&OpenChannel, &mock_client));
   RunMessageLoop();
   EXPECT_TRUE(mock_client.get_resource_context_called());
   EXPECT_TRUE(mock_client.set_plugin_info_called());
   EXPECT_TRUE(mock_client.on_found_plugin_process_host_called());
   EXPECT_TRUE(mock_client.on_sent_plugin_channel_request_called());
 }
 
 }  // namespace content