CDP: make optional params follow required

See https://chromium-review.googlesource.com/c/chromium/src/+/2148315
for details.

Change-Id: I2d1d738ff265505344a394f99a9990429cb96f71
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2149375
Commit-Queue: Pavel Feldman <pfeldman@chromium.org>
Reviewed-by: Yang Guo <yangguo@chromium.org>
Reviewed-by: Andrey Kosyakov <caseq@chromium.org>
Cr-Commit-Position: refs/heads/master@{#758974}

content/browser/devtools/protocol/browser_handler.cc

@@ -329,9 +329,9 @@ Response BrowserHandler::FindBrowserContext(
 }
 
 Response BrowserHandler::SetPermission(
-    Maybe<std::string> origin,
     std::unique_ptr<protocol::Browser::PermissionDescriptor> permission,
     const protocol::Browser::PermissionSetting& setting,
+    Maybe<std::string> origin,
     Maybe<std::string> browser_context_id) {
   BrowserContext* browser_context = nullptr;
   Response response = FindBrowserContext(browser_context_id, &browser_context);
@@ -373,9 +373,9 @@ Response BrowserHandler::SetPermission(
 }
 
 Response BrowserHandler::GrantPermissions(
-    Maybe<std::string> origin,
     std::unique_ptr<protocol::Array<protocol::Browser::PermissionType>>
         permissions,
+    Maybe<std::string> origin,
     Maybe<std::string> browser_context_id) {
   BrowserContext* browser_context = nullptr;
   Response response = FindBrowserContext(browser_context_id, &browser_context);

content/browser/devtools/protocol/browser_handler.h

@@ -50,15 +50,15 @@ class BrowserHandler : public DevToolsDomainHandler, public Browser::Backend {
       std::unique_ptr<protocol::Array<std::string>>* arguments) override;
 
   Response SetPermission(
-      Maybe<std::string> origin,
       std::unique_ptr<protocol::Browser::PermissionDescriptor> permission,
       const protocol::Browser::PermissionSetting& setting,
+      Maybe<std::string> origin,
       Maybe<std::string> browser_context_id) override;
 
   Response GrantPermissions(
-      Maybe<std::string> origin,
       std::unique_ptr<protocol::Array<protocol::Browser::PermissionType>>
           permissions,
+      Maybe<std::string> origin,
       Maybe<std::string> browser_context_id) override;
 
   Response ResetPermissions(Maybe<std::string> browser_context_id) override;

third_party/blink/public/devtools_protocol/browser_protocol.pdl

@@ -700,21 +700,21 @@ domain Browser
   # Set permission settings for given origin.
   experimental command setPermission
     parameters
-      # Origin the permission applies to, all origins if not specified.
-      optional string origin
       # Descriptor of permission to override.
       PermissionDescriptor permission
       # Setting of the permission.
       PermissionSetting setting
+      # Origin the permission applies to, all origins if not specified.
+      optional string origin
       # Context to override. When omitted, default browser context is used.
       optional BrowserContextID browserContextId
 
   # Grant specific permissions to the given origin and reject all others.
   experimental command grantPermissions
     parameters
+      array of PermissionType permissions
       # Origin the permission applies to, all origins if not specified.
       optional string origin
-      array of PermissionType permissions
       # BrowserContext to override permissions. When omitted, default browser context is used.
       optional BrowserContextID browserContextId