Merge Chromium at r65505: Initial merge by git.

Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45

1 files changed, 5 insertions, 4 deletions

diff --git a/chrome/common/net/url_request_context_getter.h b/chrome/common/net/url_request_context_getter.h
index 2b6ea82..ade5e1a 100644
--- a/chrome/common/net/url_request_context_getter.h
+++ b/chrome/common/net/url_request_context_getter.h
@@ -33,7 +33,8 @@ class URLRequestContextGetter
   // Returns a MessageLoopProxy corresponding to the thread on which the
   // request IO happens (the thread on which the returned URLRequestContext
   // may be used).
-  virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() = 0;
+  virtual scoped_refptr<base::MessageLoopProxy>
+      GetIOMessageLoopProxy() const = 0;
 
   // Controls whether or not the URLRequestContextGetter considers itself to be
   // the the "main" URLRequestContextGetter.  Note that each Profile will have a
@@ -44,7 +45,7 @@ class URLRequestContextGetter
   void set_is_main(bool is_main) { is_main_ = is_main; }
 
  protected:
-  friend class DeleteTask<URLRequestContextGetter>;
+  friend class DeleteTask<const URLRequestContextGetter>;
   friend struct URLRequestContextGetterTraits;
 
   URLRequestContextGetter();
@@ -55,7 +56,7 @@ class URLRequestContextGetter
  private:
   // OnDestruct is meant to ensure deletion on the thread on which the request
   // IO happens.
-  void OnDestruct();
+  void OnDestruct() const;
 
   // Indicates whether or not this is the default URLRequestContextGetter for
   // the main Profile.
@@ -63,7 +64,7 @@ class URLRequestContextGetter
 };
 
 struct URLRequestContextGetterTraits {
-  static void Destruct(URLRequestContextGetter* context_getter) {
+  static void Destruct(const URLRequestContextGetter* context_getter) {
     context_getter->OnDestruct();
   }
 };