Fix in-page logic for allow_universal_access_from_files.

content/browser/frame_host/frame_tree_node.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_
 #define CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 94 matching lines @@
 
   // Assigns a new opener for this node and, if |opener| is non-null, registers
   // an observer that will clear this node's opener if |opener| is ever
   // destroyed.
   void SetOpener(FrameTreeNode* opener);
 
   FrameTreeNode* child_at(size_t index) const {
     return children_[index].get();
   }
 
+  // Returns the URL of the last committed page in this frame.
   const GURL& current_url() const {
     return current_url_;
   }
 
   // Sets the last committed URL for this frame and updates
   // has_committed_real_load accordingly.
   void SetCurrentURL(const GURL& url);
 
   // Returns true iff SetCurrentURL has been called with a non-blank URL.
   bool has_committed_real_load() const {
     return has_committed_real_load_;
   }
 
+  // Returns the origin of the last committed page in this frame.
+  const url::Origin& current_origin() const {

[alexmos, 2015/11/20 18:07:36]

Is it worth also simplifying tests that use "current_replication_state().origin"
to use this instead?  There are a few in site_per_process_browsertest.cc and
frame_tree_browsertest.cc.  Though it's also ok to do it later.

[Charlie Reis, 2015/11/20 19:54:32]

Sure, I'll do that in a followup CL.

+    return replication_state_.origin;
+  }
+
   // Set the current origin and notify proxies about the update.
   void SetCurrentOrigin(const url::Origin& origin);
 
   // Set the current name and notify proxies about the update.
   void SetFrameName(const std::string& name);
 
   blink::WebSandboxFlags effective_sandbox_flags() {
     return effective_sandbox_flags_;
   }
 
@@ skipping 173 matching lines @@
   base::ObserverList<Observer> observers_;
 
   base::TimeTicks last_focus_time_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameTreeNode);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_