Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6087)

Unified Diff: chrome/browser/net/connection_tester.cc

Issue 11635050: Fix iOS build for XCode 4.6. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Split new define into multiple lines Created 7 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/net/connection_tester.cc
diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc
index 2f9ecabe47bb013fee99e8491f36985fecb4f7c7..f5e892b6dcb05b187d575d71b365806386729b40 100644
--- a/chrome/browser/net/connection_tester.cc
+++ b/chrome/browser/net/connection_tester.cc
@@ -50,8 +50,10 @@ namespace {
class ExperimentURLRequestContext : public net::URLRequestContext {
public:
explicit ExperimentURLRequestContext(
- net::URLRequestContext* proxy_request_context)
- : proxy_request_context_(proxy_request_context),
+ net::URLRequestContext* proxy_request_context) :
+#if !defined(OS_IOS)
+ proxy_request_context_(proxy_request_context),
wtc 2013/01/04 00:58:36 Does the compiler warn about an unused class membe
justincohen 2013/01/04 03:54:10 Correct: chrome/browser/net/connection_tester.cc:2
+#endif
ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)),
ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {}
@@ -286,7 +288,9 @@ class ExperimentURLRequestContext : public net::URLRequestContext {
#endif
}
+#if !defined(OS_IOS)
net::URLRequestContext* const proxy_request_context_;
+#endif
net::URLRequestContextStorage storage_;
base::WeakPtrFactory<ExperimentURLRequestContext> weak_factory_;
};

Powered by Google App Engine
This is Rietveld 408576698