Rename the flag of 'allow-top-navigation-with-user-activation' to 'allow-top-navigation-by-user-act…

third_party/WebKit/Source/core/frame/Frame.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Simon Hausmann <hausmann@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  *                     2001 George Staikos <staikos@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
@@ skipping 267 matching lines @@
         (securityContext()->isSandboxed(SandboxPopups) ||
          targetFrame.client()->opener() != this)) {
       reason =
           "The frame attempting navigation is sandboxed and is trying "
           "to navigate a popup, but is not the popup's opener and is not "
           "set to propagate sandboxing to popups.";
       return false;
     }
 
     // Top navigation is forbidden unless opted-in. allow-top-navigation or
-    // allow-top-navigation-with-user-activation will also skips origin checks.
+    // allow-top-navigation-by-user-activation will also skips origin checks.
     if (targetFrame == tree().top()) {
       if (securityContext()->isSandboxed(SandboxTopNavigation) &&
           securityContext()->isSandboxed(
-              SandboxTopNavigationWithUserActivation)) {
-        // TODO(binlu): To add "or 'allow-top-navigation-with-user-activation'"
+              SandboxTopNavigationByUserActivation)) {
+        // TODO(binlu): To add "or 'allow-top-navigation-by-user-activation'"
         // to the reason below, once the new flag is shipped.
         reason =
             "The frame attempting navigation of the top-level window is "
             "sandboxed, but the 'allow-top-navigation' flag is not set.";
         return false;
       }
       if (securityContext()->isSandboxed(SandboxTopNavigation) &&
           !securityContext()->isSandboxed(
-              SandboxTopNavigationWithUserActivation) &&
+              SandboxTopNavigationByUserActivation) &&
           !UserGestureIndicator::processingUserGesture()) {
-        // With only 'allow-top-navigation-with-user-activation' (but not
+        // With only 'allow-top-navigation-by-user-activation' (but not
         // 'allow-top-navigation'), top navigation requires a user gesture.
         reason =
             "The frame attempting navigation of the top-level window is "
-            "sandboxed with the 'allow-top-navigation-with-user-activation' "
+            "sandboxed with the 'allow-top-navigation-by-user-activation' "
             "flag, but has no user activation (aka gesture). See "
             "https://www.chromestatus.com/feature/5629582019395584.";
         return false;
       }
       return true;
     }
   }
 
   ASSERT(securityContext()->getSecurityOrigin());
   SecurityOrigin& origin = *securityContext()->getSecurityOrigin();
@@ skipping 96 matching lines @@
 
   ASSERT(page());
 
   if (m_owner)
     m_owner->setContentFrame(*this);
   else
     page()->setMainFrame(this);
 }
 
 }  // namespace blink