Simplify threading in browser thread by making only ChromeThread deal with di...

chrome/browser/sync/glue/http_bridge.h

 // Copyright (c) 2006-2008 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.
 
 #if defined(BROWSER_SYNC)
 
 #ifndef CHROME_BROWSER_SYNC_GLUE_HTTP_BRIDGE_H_
 #define CHROME_BROWSER_SYNC_GLUE_HTTP_BRIDGE_H_
 
 #include <string>
@@ skipping 79 matching lines @@
     std::string user_agent_;
 
     scoped_refptr<URLRequestContextGetter> baseline_context_getter_;
 
     // Lazily initialized by GetURLRequestContext().
     scoped_refptr<RequestContext> context_;
 
     DISALLOW_COPY_AND_ASSIGN(RequestContextGetter);
   };
 
-  HttpBridge(RequestContextGetter* context, MessageLoop* io_loop);
+  HttpBridge(RequestContextGetter* context);
   virtual ~HttpBridge();
 
   // sync_api::HttpPostProvider implementation.
   virtual void SetUserAgent(const char* user_agent);
   virtual void SetExtraRequestHeaders(const char* headers);
   virtual void SetURL(const char* url, int port);
   virtual void SetPostPayload(const char* content_type, int content_length,
                               const char* content);
   virtual bool MakeSynchronousPost(int* os_error_code, int* response_code);
 
@@ skipping 17 matching lines @@
   }
 #endif
 
  protected:
   // Protected virtual so the unit test can override to shunt network requests.
   virtual void MakeAsynchronousPost();
 
  private:
   friend class ::HttpBridgeTest;
 
-  // Called on the io_loop_ to issue the network request. The extra level
+  // Called on the IO loop to issue the network request. The extra level
   // of indirection is so that the unit test can override this behavior but we
   // still have a function to statically pass to PostTask.
   void CallMakeAsynchronousPost() { MakeAsynchronousPost(); }
 
   // Gets a customized URLRequestContext for bridged requests. See
   // RequestContext definition for details.
   RequestContextGetter* context_getter_for_request_;
 
   // Our hook into the network layer is a URLFetcher. USED ONLY ON THE IO LOOP,
   // so we can block created_on_loop_ while the fetch is in progress.
   // NOTE: This is not a scoped_ptr for a reason. It must be deleted on the same
   // thread that created it, which isn't the same thread |this| gets deleted on.
-  // We must manually delete url_poster_ on the io_loop_.
+  // We must manually delete url_poster_ on the IO loop.
   URLFetcher* url_poster_;
 
   // The message loop of the thread we were created on. This is the thread that
   // will block on MakeSynchronousPost while the IO thread fetches data from
   // the network.
   // This should be the main syncer thread (SyncerThread) which is what blocks
   // on network IO through curl_easy_perform.
   MessageLoop* const created_on_loop_;
 
-  // Member variable for the IO loop instead of asking ChromeThread directly,
-  // done this way for testability.
-  MessageLoop* const io_loop_;
-
   // The URL to POST to.
   GURL url_for_request_;
 
   // POST payload information.
   std::string content_type_;
   std::string request_content_;
   std::string extra_headers_;
 
   // Cached response data.
   bool request_completed_;
   bool request_succeeded_;
   int http_response_code_;
   int os_error_code_;
   std::string response_content_;
 
   // A waitable event we use to provide blocking semantics to
-  // MakeSynchronousPost. We block created_on_loop_ while the io_loop_ fetches
+  // MakeSynchronousPost. We block created_on_loop_ while the IO loop fetches
   // network request.
   base::WaitableEvent http_post_completed_;
 
-  // This is here so that the unit test subclass can force our URLFetcher to
-  // use the io_loop_ passed on construction for network requests, rather than
-  // ChromeThread::IO's message loop (which won't exist in testing).
-  bool use_io_loop_for_testing_;
-
   DISALLOW_COPY_AND_ASSIGN(HttpBridge);
 };
 
 class HttpBridgeFactory
   : public sync_api::HttpPostProviderFactory {
  public:
   explicit HttpBridgeFactory(URLRequestContextGetter* baseline_context_getter);
   virtual ~HttpBridgeFactory();
   virtual sync_api::HttpPostProviderInterface* Create();
   virtual void Destroy(sync_api::HttpPostProviderInterface* http);
  private:
   // This request context is built on top of the baseline context and shares
   // common components.
   HttpBridge::RequestContextGetter* GetRequestContextGetter();
   // We must Release() this from the IO thread.
   HttpBridge::RequestContextGetter* request_context_getter_;
   DISALLOW_COPY_AND_ASSIGN(HttpBridgeFactory);
 };
 
 }  //  namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_HTTP_BRIDGE_H_
 
 #endif  // defined(BROWSER_SYNC)