Upgrade Insecure Requests: bugfixes, tests, and support for OOPIF.

third_party/WebKit/Source/core/loader/FrameLoader.h

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  * 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:
@@ skipping 141 matching lines @@
   void dispatchDocumentElementAvailable();
   void runScriptsAtDocumentElementAvailable();
 
   // The following sandbox flags will be forced, regardless of changes to the
   // sandbox attribute of any parent frames.
   void forceSandboxFlags(SandboxFlags flags) { m_forcedSandboxFlags |= flags; }
   SandboxFlags effectiveSandboxFlags() const;
 
   WebInsecureRequestPolicy getInsecureRequestPolicy() const;
   SecurityContext::InsecureNavigationsSet* insecureNavigationsToUpgrade() const;
-  void modifyRequestForCSP(ResourceRequest&, Document*) const;
+  void modifyRequestForCSP(ResourceRequest&, Document* originDocument) const;
 
   Frame* opener();
   void setOpener(LocalFrame*);
 
   const AtomicString& requiredCSP() const { return m_requiredCSP; }
   void recordLatestRequiredCSP();
 
   void detach();
 
   void finishedParsing();
@@ skipping 74 matching lines @@
                           PassRefPtr<SerializedScriptValue> stateObject,
                           FrameLoadType,
                           HistoryLoadType,
                           ClientRedirectPolicy,
                           Document*);
 
   void scheduleCheckCompleted();
 
   void detachDocumentLoader(Member<DocumentLoader>&);
 
-  void upgradeInsecureRequest(ResourceRequest&, Document*) const;
+  void upgradeInsecureRequest(ResourceRequest&, Document* originDocument) const;
 
   std::unique_ptr<TracedValue> toTracedValue() const;
   void takeObjectSnapshot() const;
 
   Member<LocalFrame> m_frame;
   AtomicString m_requiredCSP;
 
   // FIXME: These should be std::unique_ptr<T> to reduce build times and
   // simplify header dependencies unless performance testing proves otherwise.
   // Some of these could be lazily created for memory savings on devices.
@@ skipping 52 matching lines @@
   SandboxFlags m_forcedSandboxFlags;
 
   bool m_dispatchingDidClearWindowObjectInMainWorld;
   bool m_protectProvisionalLoader;
   bool m_isNavigationHandledByClient;
 };
 
 }  // namespace blink
 
 #endif  // FrameLoader_h