Remove calls to MessageLoop::current() in sync.

sync/internal_api/http_bridge.cc

 // Copyright 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 "sync/internal_api/public/http_bridge.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <vector>
 
 #include "base/bit_cast.h"
 #include "base/location.h"
-#include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_network_layer.h"
@@ skipping 99 matching lines @@
       http_response_code(-1),
       error_code(-1) {
 }
 HttpBridge::URLFetchState::~URLFetchState() {}
 
 HttpBridge::HttpBridge(
     const std::string& user_agent,
     const scoped_refptr<net::URLRequestContextGetter>& context_getter,
     const NetworkTimeUpdateCallback& network_time_update_callback,
     const BindToTrackerCallback& bind_to_tracker_callback)
-    : created_on_loop_(base::MessageLoop::current()),
-      user_agent_(user_agent),
+    : user_agent_(user_agent),
       http_post_completed_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
                            base::WaitableEvent::InitialState::NOT_SIGNALED),
       request_context_getter_(context_getter),
       network_task_runner_(request_context_getter_->GetNetworkTaskRunner()),
       network_time_update_callback_(network_time_update_callback),
       bind_to_tracker_callback_(bind_to_tracker_callback) {}
 
 HttpBridge::~HttpBridge() {
 }
 
 void HttpBridge::SetExtraRequestHeaders(const char * headers) {
   DCHECK(extra_headers_.empty())
       << "HttpBridge::SetExtraRequestHeaders called twice.";
   extra_headers_.assign(headers);
 }
 
 void HttpBridge::SetURL(const char* url, int port) {
 #if DCHECK_IS_ON()
-  DCHECK_EQ(base::MessageLoop::current(), created_on_loop_);
+  DCHECK(thread_checker_.CalledOnValidThread());
   {
     base::AutoLock lock(fetch_state_lock_);
     DCHECK(!fetch_state_.request_completed);
   }
   DCHECK(url_for_request_.is_empty())
       << "HttpBridge::SetURL called more than once?!";
 #endif
   GURL temp(url);
   GURL::Replacements replacements;
   std::string port_str = base::IntToString(port);
   replacements.SetPort(port_str.c_str(), url::Component(0, port_str.length()));
   url_for_request_ = temp.ReplaceComponents(replacements);
 }
 
 void HttpBridge::SetPostPayload(const char* content_type,
                                 int content_length,
                                 const char* content) {
 #if DCHECK_IS_ON()
-  DCHECK_EQ(base::MessageLoop::current(), created_on_loop_);
+  DCHECK(thread_checker_.CalledOnValidThread());
   {
     base::AutoLock lock(fetch_state_lock_);
     DCHECK(!fetch_state_.request_completed);
   }
   DCHECK(content_type_.empty()) << "Bridge payload already set.";
   DCHECK_GE(content_length, 0) << "Content length < 0";
 #endif
   content_type_ = content_type;
   if (!content || (content_length == 0)) {
     DCHECK_EQ(content_length, 0);
     request_content_ = " ";  // TODO(timsteele): URLFetcher requires non-empty
                              // content for POSTs whereas CURL does not, for now
                              // we hack this to support the sync backend.
   } else {
     request_content_.assign(content, content_length);
   }
 }
 
 bool HttpBridge::MakeSynchronousPost(int* error_code, int* response_code) {
 #if DCHECK_IS_ON()
-  DCHECK_EQ(base::MessageLoop::current(), created_on_loop_);
+  DCHECK(thread_checker_.CalledOnValidThread());
   {
     base::AutoLock lock(fetch_state_lock_);
     DCHECK(!fetch_state_.request_completed);
   }
   DCHECK(url_for_request_.is_valid()) << "Invalid URL for request";
   DCHECK(!content_type_.empty()) << "Payload not set";
 #endif
 
   if (!network_task_runner_->PostTask(
           FROM_HERE,
@@ skipping 48 matching lines @@
       "%s: %s", net::HttpRequestHeaders::kUserAgent, user_agent_.c_str()));
   fetch_state_.url_poster->SetLoadFlags(net::LOAD_BYPASS_CACHE |
                                         net::LOAD_DISABLE_CACHE |
                                         net::LOAD_DO_NOT_SAVE_COOKIES |
                                         net::LOAD_DO_NOT_SEND_COOKIES);
 
   fetch_state_.url_poster->Start();
 }
 
 int HttpBridge::GetResponseContentLength() const {
-  DCHECK_EQ(base::MessageLoop::current(), created_on_loop_);
+  DCHECK(thread_checker_.CalledOnValidThread());
   base::AutoLock lock(fetch_state_lock_);
   DCHECK(fetch_state_.request_completed);
   return fetch_state_.response_content.size();
 }
 
 const char* HttpBridge::GetResponseContent() const {
-  DCHECK_EQ(base::MessageLoop::current(), created_on_loop_);
+  DCHECK(thread_checker_.CalledOnValidThread());
   base::AutoLock lock(fetch_state_lock_);
   DCHECK(fetch_state_.request_completed);
   return fetch_state_.response_content.data();
 }
 
 const std::string HttpBridge::GetResponseHeaderValue(
     const std::string& name) const {
-
-  DCHECK_EQ(base::MessageLoop::current(), created_on_loop_);
+  DCHECK(thread_checker_.CalledOnValidThread());
   base::AutoLock lock(fetch_state_lock_);
   DCHECK(fetch_state_.request_completed);
 
   std::string value;
   fetch_state_.response_headers->EnumerateHeader(NULL, name, &value);
   return value;
 }
 
 void HttpBridge::Abort() {
   base::AutoLock lock(fetch_state_lock_);
@@ skipping 154 matching lines @@
   int64_t sane_time_ms = 0;
   if (base::StringToInt64(sane_time_str, &sane_time_ms)) {
     network_time_update_callback_.Run(
         base::Time::FromJsTime(sane_time_ms),
         base::TimeDelta::FromMilliseconds(1),
         fetch_state_.end_time - fetch_state_.start_time);
   }
 }
 
 }  // namespace syncer