summaryrefslogtreecommitdiffstats
path: root/chrome/common/net
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-22 22:19:24 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-22 22:19:24 +0000
commit00ed48fe2d42c952a3d41c83ed26a130342521aa (patch)
tree80e7d1b3f210725306d505c21a989c963e902f0a /chrome/common/net
parent8c7697346f2632d3356e9d57b8f105e9cfa26747 (diff)
downloadchromium_src-00ed48fe2d42c952a3d41c83ed26a130342521aa.zip
chromium_src-00ed48fe2d42c952a3d41c83ed26a130342521aa.tar.gz
chromium_src-00ed48fe2d42c952a3d41c83ed26a130342521aa.tar.bz2
Revert "Revert "Const-ify RefCountedThreadSafe::AddRef and Release.""
chrome_frame failed to compile last time. I needed to add a "mutable" to a member variable in chrome_frame/metrics_service.cc. Review URL: http://codereview.chromium.org/3971004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63574 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/net')
-rw-r--r--chrome/common/net/url_fetcher_unittest.cc4
-rw-r--r--chrome/common/net/url_request_context_getter.cc2
-rw-r--r--chrome/common/net/url_request_context_getter.h9
3 files changed, 8 insertions, 7 deletions
diff --git a/chrome/common/net/url_fetcher_unittest.cc b/chrome/common/net/url_fetcher_unittest.cc
index 3fc8469..512f38b 100644
--- a/chrome/common/net/url_fetcher_unittest.cc
+++ b/chrome/common/net/url_fetcher_unittest.cc
@@ -34,7 +34,7 @@ class TestURLRequestContextGetter : public URLRequestContextGetter {
context_ = new TestURLRequestContext();
return context_;
}
- virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() {
+ virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() const {
return io_message_loop_proxy_;
}
@@ -199,7 +199,7 @@ class CancelTestURLRequestContextGetter : public URLRequestContextGetter {
}
return context_;
}
- virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() {
+ virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() const {
return io_message_loop_proxy_;
}
void WaitForContextCreation() {
diff --git a/chrome/common/net/url_request_context_getter.cc b/chrome/common/net/url_request_context_getter.cc
index 57feb0e..08b5368 100644
--- a/chrome/common/net/url_request_context_getter.cc
+++ b/chrome/common/net/url_request_context_getter.cc
@@ -14,7 +14,7 @@ URLRequestContextGetter::URLRequestContextGetter() : is_main_(false) {}
URLRequestContextGetter::~URLRequestContextGetter() {}
-void URLRequestContextGetter::OnDestruct() {
+void URLRequestContextGetter::OnDestruct() const {
scoped_refptr<base::MessageLoopProxy> io_message_loop_proxy =
GetIOMessageLoopProxy();
DCHECK(io_message_loop_proxy);
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();
}
};