| Index: content/shell/common/layout_test/layout_test_messages.h
|
| diff --git a/content/shell/common/layout_test/layout_test_messages.h b/content/shell/common/layout_test/layout_test_messages.h
|
| index 97b3073899bbfb40f2582bdc4b886e3fc3ba7e87..c6d3c92d15e11577a179e44abc411c48f77adbda 100644
|
| --- a/content/shell/common/layout_test/layout_test_messages.h
|
| +++ b/content/shell/common/layout_test/layout_test_messages.h
|
| @@ -6,17 +6,17 @@
|
| #include <string>
|
| #include <vector>
|
|
|
| +#include "components/permission/public/interfaces/permission_status.mojom.h"
|
| #include "content/public/common/common_param_traits.h"
|
| -#include "content/public/common/permission_status.mojom.h"
|
| #include "ipc/ipc_message_macros.h"
|
| #include "ipc/ipc_platform_file.h"
|
| #include "url/gurl.h"
|
|
|
| #define IPC_MESSAGE_START LayoutTestMsgStart
|
|
|
| -IPC_ENUM_TRAITS_MIN_MAX_VALUE(content::PermissionStatus,
|
| - content::PERMISSION_STATUS_GRANTED,
|
| - content::PERMISSION_STATUS_ASK)
|
| +IPC_ENUM_TRAITS_MIN_MAX_VALUE(permission::Status,
|
| + permission::STATUS_GRANTED,
|
| + permission::STATUS_ASK)
|
|
|
| IPC_SYNC_MESSAGE_ROUTED1_1(LayoutTestHostMsg_ReadFileToString,
|
| base::FilePath /* local path */,
|
| @@ -35,9 +35,9 @@ IPC_MESSAGE_ROUTED1(LayoutTestHostMsg_AcceptAllCookies,
|
| IPC_MESSAGE_ROUTED0(LayoutTestHostMsg_DeleteAllCookies)
|
| IPC_MESSAGE_ROUTED4(LayoutTestHostMsg_SetPermission,
|
| std::string /* name */,
|
| - content::PermissionStatus /* status */,
|
| + permission::Status /* status */,
|
| GURL /* origin */,
|
| - GURL /* embedding_origin */ )
|
| + GURL /* embedding_origin */)
|
| IPC_MESSAGE_ROUTED0(LayoutTestHostMsg_ResetPermissions)
|
| IPC_MESSAGE_CONTROL1(LayoutTestHostMsg_SetBluetoothAdapter,
|
| std::string /* name */)
|
|
|