[WIP] WebFonts cache-aware timeout adaption

third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 619 matching lines @@
         request.setHTTPHeaderField(AtomicString(header.first),
                                    AtomicString(value));
     }
   }
 
   request.setReportRawHeaders(true);
 
   if (m_state->booleanProperty(NetworkAgentState::cacheDisabled, false)) {
     // It shouldn't be a ReturnCacheDataDontLoad request as those are blocked
     // in shouldBlockRequest.
-    DCHECK_NE(WebCachePolicy::ReturnCacheDataDontLoad,
-              request.getCachePolicy());
+    // TODO(shaochuan): Cache-aware loading will be deactivated in
+    // setCachePolicy() if activated here. crbug.com/632580
+    DCHECK(request.isCacheAwareLoadingActivated() ||
+           WebCachePolicy::ReturnCacheDataDontLoad != request.getCachePolicy());
     request.setCachePolicy(WebCachePolicy::BypassingCache);
     request.setShouldResetAppCache(true);
   }
   if (m_state->booleanProperty(NetworkAgentState::bypassServiceWorker, false))
     request.setSkipServiceWorker(WebURLRequest::SkipServiceWorker::All);
 
   willSendRequestInternal(frame, identifier, loader, request, redirectResponse,
                           initiatorInfo);
 
   if (!m_hostId.isEmpty())
@@ skipping 789 matching lines @@
       m_isRecalculatingStyle(false),
       m_removeFinishedReplayXHRTimer(
           this,
           &InspectorNetworkAgent::removeFinishedReplayXHRFired) {}
 
 bool InspectorNetworkAgent::shouldForceCORSPreflight() {
   return m_state->booleanProperty(NetworkAgentState::cacheDisabled, false);
 }
 
 }  // namespace blink