[chrome/browser/net] favor DCHECK_CURRENTLY_ON for better logs

chrome/browser/net/sdch_browsertest.cc

 // Copyright 2014 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.
 
 // End-to-end SDCH tests.  Uses the embedded test server to return SDCH
 // results
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 516 matching lines @@
     EXPECT_EQ(request_vector[2].relative_url, kDataURLPath);
     EXPECT_EQ(request_vector[3].relative_url, kDataURLPath);
     return (4u == request_vector.size() &&
             request_vector[2].relative_url == kDataURLPath &&
             request_vector[3].relative_url == kDataURLPath);
   }
 
  private:
   static void NukeSdchDictionariesOnIOThread(
       net::URLRequestContextGetter* context_getter) {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
     net::SdchManager* sdch_manager =
         context_getter->GetURLRequestContext()->sdch_manager();
     DCHECK(sdch_manager);
     sdch_manager->ClearData();
   }
 
   void GetNumberOfDictionaryFetchesOnIOThread(
       net::URLRequestContextGetter* context_getter,
       int* result) {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
     net::SdchManager* manager(
         context_getter->GetURLRequestContext()->sdch_manager());
     DCHECK(fetch_counts_.end() != fetch_counts_.find(manager));
 
     *result = fetch_counts_[manager];
   }
 
   // InProcessBrowserTest
   void SetUpCommandLine(base::CommandLine* command_line) override {
@@ skipping 26 matching lines @@
 
     content::BrowserThread::PostTask(
         content::BrowserThread::IO,
         FROM_HERE,
         base::Bind(&SdchBrowserTest::UnsubscribeFromAllSdchNotifications,
                    base::Unretained(this)));
   }
 
   void SubscribeToSdchNotifications(
       net::URLRequestContextGetter* context_getter) {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
     net::SdchManager* manager =
         context_getter->GetURLRequestContext()->sdch_manager();
     DCHECK(fetch_counts_.end() == fetch_counts_.find(manager));
 
     fetch_counts_[manager] = 0;
     manager->AddObserver(this);
   }
 
   void UnsubscribeFromAllSdchNotifications() {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
     for (auto it = fetch_counts_.begin(); it != fetch_counts_.end(); ++it)
       it->first->RemoveObserver(this);
 
     fetch_counts_.clear();
   }
 
   // SdchObserver
   void OnDictionaryUsed(net::SdchManager* manager,
                         const std::string& server_hash) override {}
 
   void OnGetDictionary(net::SdchManager* manager,
                        const GURL& request_url,
                        const GURL& dictionary_url) override {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
     DLOG(ERROR) << "Retrieving count of notifications from manager " << manager;
     DCHECK(fetch_counts_.end() != fetch_counts_.find(manager));
     ++fetch_counts_[manager];
   }
 
   void OnClearDictionaries(net::SdchManager* manager) override {}
 
   // URLFetcherDelegate
   void OnURLFetchComplete(const net::URLFetcher* source) override {
     url_fetch_complete_ = true;
@@ skipping 64 matching lines @@
   ASSERT_TRUE(SetupIncognitoBrowser());
   ASSERT_TRUE(ForceSdchDictionaryLoad(incognito_browser()));
 
   // Data fetches on main browser should not be SDCH encoded.
   bool sdch_encoding_used = true;
   ASSERT_TRUE(GetData(&sdch_encoding_used));
   EXPECT_FALSE(sdch_encoding_used);
 }
 
 }  // namespace