Rename Origin.unique() to opaque().

content/browser/frame_host/frame_tree_browsertest.cc

 // Copyright 2014 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.
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
@@ skipping 256 matching lines @@
   EXPECT_TRUE(
       root->current_frame_host()->GetLastCommittedOrigin().IsSameOriginWith(
           root->child_at(0)->current_frame_host()->GetLastCommittedOrigin()));
   EXPECT_EQ(root->current_origin().Serialize(), GetOriginFromRenderer(root));
   EXPECT_EQ(root->child_at(0)->current_origin().Serialize(),
             GetOriginFromRenderer(root->child_at(0)));
 
   GURL data_url("data:text/html,foo");
   EXPECT_TRUE(NavigateToURL(shell(), data_url));
 
-  // Navigating to a data URL should set a unique origin.  This is represented
-  // as "null" per RFC 6454.
+  // Navigating to a data URL should set a unique opaque origin. This is
+  // represented as "null" per RFC 6454.
   EXPECT_EQ("null", root->current_origin().Serialize());
-  EXPECT_TRUE(contents->GetMainFrame()->GetLastCommittedOrigin().unique());
+  EXPECT_TRUE(contents->GetMainFrame()->GetLastCommittedOrigin().opaque());
   EXPECT_EQ("null", GetOriginFromRenderer(root));
 
   // Re-navigating to a normal URL should update the origin.
   EXPECT_TRUE(NavigateToURL(shell(), main_url));
   EXPECT_EQ(main_url.GetOrigin().spec(),
             root->current_origin().Serialize() + '/');
   EXPECT_EQ(
       main_url.GetOrigin().spec(),
       contents->GetMainFrame()->GetLastCommittedOrigin().Serialize() + '/');
-  EXPECT_FALSE(contents->GetMainFrame()->GetLastCommittedOrigin().unique());
+  EXPECT_FALSE(contents->GetMainFrame()->GetLastCommittedOrigin().opaque());
   EXPECT_EQ(root->current_origin().Serialize(), GetOriginFromRenderer(root));
 }
 
 // Tests a cross-origin navigation to a blob URL. The main frame initiates this
 // navigation on its grandchild. It should wind up in the main frame's process.
 IN_PROC_BROWSER_TEST_F(FrameTreeBrowserTest, NavigateGrandchildToBlob) {
   WebContents* contents = shell()->web_contents();
   FrameTreeNode* root =
       static_cast<WebContentsImpl*>(contents)->GetFrameTree()->root();
 
@@ skipping 26 matching lines @@
       "         window.parent.parent.postMessage(\"HI\", document.origin);"
       "     </script></body></html>'], {type: 'text/html'});"
       "var blob_url = URL.createObjectURL(blob);"
       "frames[0][0].location.href = blob_url;",
       &blob_url_string));
   // Wait for the RenderFrame to go away, if this will be cross-process.
   if (AreAllSitesIsolatedForTesting())
     deleted_observer.WaitUntilDeleted();
   EXPECT_EQ(GURL(blob_url_string), target->current_url());
   EXPECT_EQ(url::kBlobScheme, target->current_url().scheme());
-  EXPECT_FALSE(target->current_origin().unique());
+  EXPECT_FALSE(target->current_origin().opaque());
   EXPECT_EQ("a.com", target->current_origin().host());
   EXPECT_EQ(url::kHttpScheme, target->current_origin().scheme());
 
   std::string document_body;
   EXPECT_TRUE(ExecuteScriptAndExtractString(
       target,
       "domAutomationController.send(document.body.children[0].innerHTML);",
       &document_body));
   EXPECT_EQ("This is blob content.", document_body);
   EXPECT_EQ(reference_tree, FrameTreeVisualizer().DepictFrameTree(root));
@@ skipping 28 matching lines @@
       "  // Poll the document until it doesn't throw a SecurityError.\n"
       "  try {"
       "    frames[0].document.write('Hi from ' + document.domain);"
       "  } catch (e) { return; }"
       "  clearInterval(intervalID);"
       "  domAutomationController.send(frames[0].document.origin);"
       "}, 16);",
       &about_blank_origin));
   EXPECT_EQ(GURL(url::kAboutBlankURL), target->current_url());
   EXPECT_EQ(url::kAboutScheme, target->current_url().scheme());
-  EXPECT_FALSE(target->current_origin().unique());
+  EXPECT_FALSE(target->current_origin().opaque());
   EXPECT_EQ("b.com", target->current_origin().host());
   EXPECT_EQ(url::kHttpScheme, target->current_origin().scheme());
   EXPECT_EQ(target->current_origin().Serialize(), about_blank_origin);
 
   std::string document_body;
   EXPECT_TRUE(ExecuteScriptAndExtractString(
       target, "domAutomationController.send(document.body.innerHTML);",
       &document_body));
   EXPECT_EQ("Hi from b.com", document_body);
 }
@@ skipping 29 matching lines @@
       "    window.open('about:blank', 'target');"
       "  }"
       "  // May raise a SecurityError, that's expected.\n"
       "  frames[0][0].document.write('Hi from ' + document.domain);"
       "  clearInterval(intervalID);"
       "  domAutomationController.send(frames[0][0].document.origin);"
       "}, 16);",
       &about_blank_origin));
   EXPECT_EQ(GURL(url::kAboutBlankURL), target->current_url());
   EXPECT_EQ(url::kAboutScheme, target->current_url().scheme());
-  EXPECT_FALSE(target->current_origin().unique());
+  EXPECT_FALSE(target->current_origin().opaque());
   EXPECT_EQ("a.com", target->current_origin().host());
   EXPECT_EQ(url::kHttpScheme, target->current_origin().scheme());
   EXPECT_EQ(target->current_origin().Serialize(), about_blank_origin);
 
   std::string document_body;
   EXPECT_TRUE(ExecuteScriptAndExtractString(
       target, "domAutomationController.send(document.body.innerHTML);",
       &document_body));
   EXPECT_EQ("Hi from a.com", document_body);
 }
@@ skipping 77 matching lines @@
   EXPECT_EQ(blink::WebSandboxFlags::kAll,
             root->child_at(0)->effective_sandbox_flags());
   EXPECT_EQ(blink::WebSandboxFlags::kAll & ~blink::WebSandboxFlags::kScripts &
                 ~blink::WebSandboxFlags::kAutomaticFeatures,
             root->child_at(1)->effective_sandbox_flags());
   EXPECT_EQ(blink::WebSandboxFlags::kAll & ~blink::WebSandboxFlags::kScripts &
                 ~blink::WebSandboxFlags::kAutomaticFeatures &
                 ~blink::WebSandboxFlags::kOrigin,
             root->child_at(2)->effective_sandbox_flags());
 
-  // Sandboxed frames should set a unique origin unless they have the
+  // Sandboxed frames should set a unique opaque origin unless they have the
   // "allow-same-origin" directive.
   EXPECT_EQ("null", root->child_at(0)->current_origin().Serialize());
   EXPECT_EQ("null", root->child_at(1)->current_origin().Serialize());
   EXPECT_EQ(main_url.GetOrigin().spec(),
             root->child_at(2)->current_origin().Serialize() + "/");
 
   // Navigating to a different URL should not clear sandbox flags.
   GURL frame_url(embedded_test_server()->GetURL("/title1.html"));
   NavigateFrameToURL(root->child_at(0), frame_url);
   EXPECT_EQ(blink::WebSandboxFlags::kAll,
@@ skipping 133 matching lines @@
   EXPECT_EQ(root->child_at(0)->current_origin().Serialize() + '/',
             cross_site_url.GetOrigin().spec());
 
   // The root's origin shouldn't have changed.
   EXPECT_EQ(root->current_origin().Serialize() + '/',
             main_url.GetOrigin().spec());
 
   GURL data_url("data:text/html,foo");
   NavigateFrameToURL(root->child_at(1), data_url);
 
-  // Navigating to a data URL should set a unique origin.  This is represented
-  // as "null" per RFC 6454.
+  // Navigating to a data URL should set a unique opaque origin. This is
+  // represented as "null" per RFC 6454.
   EXPECT_EQ(root->child_at(1)->current_origin().Serialize(), "null");
 }
 
 // FrameTreeBrowserTest variant where we isolate http://*.is, Iceland's top
 // level domain. This is an analogue to isolating extensions, which we can use
 // inside content_browsertests, where extensions don't exist. Iceland, like an
 // extension process, is a special place with magical powers; we want to protect
 // it from outsiders.
 class IsolateIcelandFrameTreeBrowserTest : public ContentBrowserTest {
  public:
@@ skipping 45 matching lines @@
   // Make sure we did a process transfer back to "b.is".
   EXPECT_EQ(
       " Site A ------------ proxies for B\n"
       "   +--Site B ------- proxies for A\n"
       "Where A = http://a.com/\n"
       "      B = http://b.is/",
       FrameTreeVisualizer().DepictFrameTree(root));
 }
 
 }  // namespace content