Reland fix for OCSP startup race.

net/url_request/url_request_context.h

Index: net/url_request/url_request_context.h
diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h
index 96de77d813057ccd6876d021a377ff9591f2ca80..bbbae67afe5b49c03a5d3ea4a55d708d0615079f 100644
--- a/net/url_request/url_request_context.h
+++ b/net/url_request/url_request_context.h
@@ -109,6 +109,11 @@ class URLRequestContext
     referrer_charset_ = charset;
   }
 
+  // Controls whether or not the URLRequestContext considers itself to be the
+  // "main" URLRequestContext.
+  bool is_main() const { return is_main_; }
+  void set_is_main(bool is_main) { is_main_ = is_main; }
+
  protected:
   friend class base::RefCountedThreadSafe<URLRequestContext>;
 
@@ -137,6 +142,9 @@ class URLRequestContext
   std::string referrer_charset_;
 
  private:
+  // Indicates whether or not this is the main URLRequestContext.
+  bool is_main_;
+
   DISALLOW_COPY_AND_ASSIGN(URLRequestContext);
 };