| Index: third_party/WebKit/Source/modules/permissions/PermissionUtils.cpp
|
| diff --git a/third_party/WebKit/Source/modules/permissions/PermissionUtils.cpp b/third_party/WebKit/Source/modules/permissions/PermissionUtils.cpp
|
| index d6a77fb92a8dd6ce84d8e2682fe8f170ba49f2ae..8cd3bf465b3e7afddcf46e36e9b750875a772f68 100644
|
| --- a/third_party/WebKit/Source/modules/permissions/PermissionUtils.cpp
|
| +++ b/third_party/WebKit/Source/modules/permissions/PermissionUtils.cpp
|
| @@ -15,7 +15,9 @@
|
|
|
| namespace blink {
|
|
|
| -using mojom::blink::PermissionDescriptor;
|
| +// There are two PermissionDescriptor, one in Mojo bindings and one
|
| +// in v8 bindings so we'll rename one here.
|
| +using MojoPermissionDescriptor = mojom::blink::PermissionDescriptor;
|
| using mojom::blink::PermissionDescriptorPtr;
|
| using mojom::blink::PermissionName;
|
|
|
| @@ -40,7 +42,7 @@ bool ConnectToPermissionService(
|
| }
|
|
|
| PermissionDescriptorPtr CreatePermissionDescriptor(PermissionName name) {
|
| - auto descriptor = PermissionDescriptor::New();
|
| + auto descriptor = MojoPermissionDescriptor::New();
|
| descriptor->name = name;
|
| return descriptor;
|
| }
|
|
|