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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ios/crnet/crnet_environment.mm

Issue 1171203004: Correct iOS build for latest Xcode beta. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: UNAVAILABLE_ATTRIBUTE->NS_UNAVAILABLE Created 5 years, 6 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
« base/ios/crb_protocol_observers_unittest.mm ('K') | « ios/chrome/browser/xcallback_parameters.mm ('k') | ios/net/empty_nsurlcache.h » ('j') | ios/net/empty_nsurlcache.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/crnet/crnet_environment.mm
diff --git a/ios/crnet/crnet_environment.mm b/ios/crnet/crnet_environment.mm
index d139b7fb4cb96dc93504087bac864e2ba2f67ee5..62e0fbbe25436a40ec6ecf655f46568bd7a89e59 100644
--- a/ios/crnet/crnet_environment.mm
+++ b/ios/crnet/crnet_environment.mm
@@ -22,6 +22,7 @@
#include "crypto/nss_util.h"
#include "ios/net/cookies/cookie_store_ios.h"
#include "ios/net/crn_http_protocol_handler.h"
+#include "ios/net/empty_nsurlcache.h"
#include "ios/net/request_tracker.h"
#include "ios/web/public/user_agent.h"
#include "net/base/net_errors.h"
@@ -300,7 +301,7 @@ net::URLRequestContextGetter* CrNetEnvironment::GetMainContextGetter() {
void CrNetEnvironment::SetHTTPProtocolHandlerRegistered(bool registered) {
if (registered) {
// Disable the default cache.
- [NSURLCache setSharedURLCache:nil];
+ [NSURLCache setSharedURLCache:[[[EmptyNSURLCache alloc] init] autorelease]];
sdefresne 2015/06/10 16:15:55 [EmptyNSURLCache emptyNSURLCache]
justincohen 2015/06/10 16:33:35 Done.
// Register the chrome http protocol handler to replace the default one.
BOOL success = [NSURLProtocol registerClass:[CRNHTTPProtocolHandler class]];
DCHECK(success);
« base/ios/crb_protocol_observers_unittest.mm ('K') | « ios/chrome/browser/xcallback_parameters.mm ('k') | ios/net/empty_nsurlcache.h » ('j') | ios/net/empty_nsurlcache.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698