diff --git a/testing/bsd-compat-headers/build b/testing/bsd-compat-headers/build deleted file mode 100755 index 82a7d699..00000000 --- a/testing/bsd-compat-headers/build +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -e - -install -D cdefs.h "$1/usr/include/sys/cdefs.h" -install -D queue.h "$1/usr/include/sys/queue.h" -install -D tree.h "$1/usr/include/sys/tree.h" diff --git a/testing/bsd-compat-headers/checksums b/testing/bsd-compat-headers/checksums deleted file mode 100644 index 50b6d13e..00000000 --- a/testing/bsd-compat-headers/checksums +++ /dev/null @@ -1,3 +0,0 @@ -30bb6d7e0e0b61fcd95d830c376c829a614bce4683c1b97e06c201ec2c6e839a cdefs.h -c13407edd0e33be73cae72514cb234f8612e1c0e54401c9448daffd3a240158b queue.h -e1e498a79bf160a5766fa560f2b07b206fe89fe21a62600c77d72e00a6992f92 tree.h diff --git a/testing/bsd-compat-headers/files/cdefs.h b/testing/bsd-compat-headers/files/cdefs.h deleted file mode 100644 index 209a623c..00000000 --- a/testing/bsd-compat-headers/files/cdefs.h +++ /dev/null @@ -1,26 +0,0 @@ -#warning usage of non-standard #include is deprecated - -#undef __P -#undef __PMT - -#define __P(args) args -#define __PMT(args) args - -#define __CONCAT(x,y) x ## y -#define __STRING(x) #x - -#ifdef __cplusplus -# define __BEGIN_DECLS extern "C" { -# define __END_DECLS } -#else -# define __BEGIN_DECLS -# define __END_DECLS -#endif - -#if defined(__GNUC__) && !defined(__cplusplus) -# define __THROW __attribute__ ((__nothrow__)) -# define __NTH(fct) __attribute__ ((__nothrow__)) fct -#else -# define __THROW -# define __NTH(fct) fct -#endif diff --git a/testing/bsd-compat-headers/files/queue.h b/testing/bsd-compat-headers/files/queue.h deleted file mode 100644 index a38499a2..00000000 --- a/testing/bsd-compat-headers/files/queue.h +++ /dev/null @@ -1,846 +0,0 @@ -/* $NetBSD: queue.h,v 1.70 2015/11/02 15:21:23 christos Exp $ */ - -/* - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)queue.h 8.5 (Berkeley) 8/20/94 - */ - -#ifndef _SYS_QUEUE_H_ -#define _SYS_QUEUE_H_ - -/* - * This file defines five types of data structures: singly-linked lists, - * lists, simple queues, tail queues, and circular queues. - * - * A singly-linked list is headed by a single forward pointer. The - * elements are singly linked for minimum space and pointer manipulation - * overhead at the expense of O(n) removal for arbitrary elements. New - * elements can be added to the list after an existing element or at the - * head of the list. Elements being removed from the head of the list - * should use the explicit macro for this purpose for optimum - * efficiency. A singly-linked list may only be traversed in the forward - * direction. Singly-linked lists are ideal for applications with large - * datasets and few or no removals or for implementing a LIFO queue. - * - * A list is headed by a single forward pointer (or an array of forward - * pointers for a hash table header). The elements are doubly linked - * so that an arbitrary element can be removed without a need to - * traverse the list. New elements can be added to the list before - * or after an existing element or at the head of the list. A list - * may only be traversed in the forward direction. - * - * A simple queue is headed by a pair of pointers, one the head of the - * list and the other to the tail of the list. The elements are singly - * linked to save space, so elements can only be removed from the - * head of the list. New elements can be added to the list after - * an existing element, at the head of the list, or at the end of the - * list. A simple queue may only be traversed in the forward direction. - * - * A tail queue is headed by a pair of pointers, one to the head of the - * list and the other to the tail of the list. The elements are doubly - * linked so that an arbitrary element can be removed without a need to - * traverse the list. New elements can be added to the list before or - * after an existing element, at the head of the list, or at the end of - * the list. A tail queue may be traversed in either direction. - * - * A circle queue is headed by a pair of pointers, one to the head of the - * list and the other to the tail of the list. The elements are doubly - * linked so that an arbitrary element can be removed without a need to - * traverse the list. New elements can be added to the list before or after - * an existing element, at the head of the list, or at the end of the list. - * A circle queue may be traversed in either direction, but has a more - * complex end of list detection. - * - * For details on the use of these macros, see the queue(3) manual page. - */ - -/* - * Include the definition of NULL only on NetBSD because sys/null.h - * is not available elsewhere. This conditional makes the header - * portable and it can simply be dropped verbatim into any system. - * The caveat is that on other systems some other header - * must provide NULL before the macros can be used. - */ -#ifdef __NetBSD__ -#include -#endif - -#if defined(QUEUEDEBUG) -# if defined(_KERNEL) -# define QUEUEDEBUG_ABORT(...) panic(__VA_ARGS__) -# else -# include -# define QUEUEDEBUG_ABORT(...) err(1, __VA_ARGS__) -# endif -#endif - -/* - * Singly-linked List definitions. - */ -#define SLIST_HEAD(name, type) \ -struct name { \ - struct type *slh_first; /* first element */ \ -} - -#define SLIST_HEAD_INITIALIZER(head) \ - { NULL } - -#define SLIST_ENTRY(type) \ -struct { \ - struct type *sle_next; /* next element */ \ -} - -/* - * Singly-linked List access methods. - */ -#define SLIST_FIRST(head) ((head)->slh_first) -#define SLIST_END(head) NULL -#define SLIST_EMPTY(head) ((head)->slh_first == NULL) -#define SLIST_NEXT(elm, field) ((elm)->field.sle_next) - -#define SLIST_FOREACH(var, head, field) \ - for((var) = (head)->slh_first; \ - (var) != SLIST_END(head); \ - (var) = (var)->field.sle_next) - -#define SLIST_FOREACH_SAFE(var, head, field, tvar) \ - for ((var) = SLIST_FIRST((head)); \ - (var) != SLIST_END(head) && \ - ((tvar) = SLIST_NEXT((var), field), 1); \ - (var) = (tvar)) - -/* - * Singly-linked List functions. - */ -#define SLIST_INIT(head) do { \ - (head)->slh_first = SLIST_END(head); \ -} while (/*CONSTCOND*/0) - -#define SLIST_INSERT_AFTER(slistelm, elm, field) do { \ - (elm)->field.sle_next = (slistelm)->field.sle_next; \ - (slistelm)->field.sle_next = (elm); \ -} while (/*CONSTCOND*/0) - -#define SLIST_INSERT_HEAD(head, elm, field) do { \ - (elm)->field.sle_next = (head)->slh_first; \ - (head)->slh_first = (elm); \ -} while (/*CONSTCOND*/0) - -#define SLIST_REMOVE_AFTER(slistelm, field) do { \ - (slistelm)->field.sle_next = \ - SLIST_NEXT(SLIST_NEXT((slistelm), field), field); \ -} while (/*CONSTCOND*/0) - -#define SLIST_REMOVE_HEAD(head, field) do { \ - (head)->slh_first = (head)->slh_first->field.sle_next; \ -} while (/*CONSTCOND*/0) - -#define SLIST_REMOVE(head, elm, type, field) do { \ - if ((head)->slh_first == (elm)) { \ - SLIST_REMOVE_HEAD((head), field); \ - } \ - else { \ - struct type *curelm = (head)->slh_first; \ - while(curelm->field.sle_next != (elm)) \ - curelm = curelm->field.sle_next; \ - curelm->field.sle_next = \ - curelm->field.sle_next->field.sle_next; \ - } \ -} while (/*CONSTCOND*/0) - - -/* - * List definitions. - */ -#define LIST_HEAD(name, type) \ -struct name { \ - struct type *lh_first; /* first element */ \ -} - -#define LIST_HEAD_INITIALIZER(head) \ - { NULL } - -#define LIST_ENTRY(type) \ -struct { \ - struct type *le_next; /* next element */ \ - struct type **le_prev; /* address of previous next element */ \ -} - -/* - * List access methods. - */ -#define LIST_FIRST(head) ((head)->lh_first) -#define LIST_END(head) NULL -#define LIST_EMPTY(head) ((head)->lh_first == LIST_END(head)) -#define LIST_NEXT(elm, field) ((elm)->field.le_next) - -#define LIST_FOREACH(var, head, field) \ - for ((var) = ((head)->lh_first); \ - (var) != LIST_END(head); \ - (var) = ((var)->field.le_next)) - -#define LIST_FOREACH_SAFE(var, head, field, tvar) \ - for ((var) = LIST_FIRST((head)); \ - (var) != LIST_END(head) && \ - ((tvar) = LIST_NEXT((var), field), 1); \ - (var) = (tvar)) - -#define LIST_MOVE(head1, head2) do { \ - LIST_INIT((head2)); \ - if (!LIST_EMPTY((head1))) { \ - (head2)->lh_first = (head1)->lh_first; \ - LIST_INIT((head1)); \ - } \ -} while (/*CONSTCOND*/0) - -/* - * List functions. - */ -#if defined(QUEUEDEBUG) -#define QUEUEDEBUG_LIST_INSERT_HEAD(head, elm, field) \ - if ((head)->lh_first && \ - (head)->lh_first->field.le_prev != &(head)->lh_first) \ - QUEUEDEBUG_ABORT("LIST_INSERT_HEAD %p %s:%d", (head), \ - __FILE__, __LINE__); -#define QUEUEDEBUG_LIST_OP(elm, field) \ - if ((elm)->field.le_next && \ - (elm)->field.le_next->field.le_prev != \ - &(elm)->field.le_next) \ - QUEUEDEBUG_ABORT("LIST_* forw %p %s:%d", (elm), \ - __FILE__, __LINE__); \ - if (*(elm)->field.le_prev != (elm)) \ - QUEUEDEBUG_ABORT("LIST_* back %p %s:%d", (elm), \ - __FILE__, __LINE__); -#define QUEUEDEBUG_LIST_POSTREMOVE(elm, field) \ - (elm)->field.le_next = (void *)1L; \ - (elm)->field.le_prev = (void *)1L; -#else -#define QUEUEDEBUG_LIST_INSERT_HEAD(head, elm, field) -#define QUEUEDEBUG_LIST_OP(elm, field) -#define QUEUEDEBUG_LIST_POSTREMOVE(elm, field) -#endif - -#define LIST_INIT(head) do { \ - (head)->lh_first = LIST_END(head); \ -} while (/*CONSTCOND*/0) - -#define LIST_INSERT_AFTER(listelm, elm, field) do { \ - QUEUEDEBUG_LIST_OP((listelm), field) \ - if (((elm)->field.le_next = (listelm)->field.le_next) != \ - LIST_END(head)) \ - (listelm)->field.le_next->field.le_prev = \ - &(elm)->field.le_next; \ - (listelm)->field.le_next = (elm); \ - (elm)->field.le_prev = &(listelm)->field.le_next; \ -} while (/*CONSTCOND*/0) - -#define LIST_INSERT_BEFORE(listelm, elm, field) do { \ - QUEUEDEBUG_LIST_OP((listelm), field) \ - (elm)->field.le_prev = (listelm)->field.le_prev; \ - (elm)->field.le_next = (listelm); \ - *(listelm)->field.le_prev = (elm); \ - (listelm)->field.le_prev = &(elm)->field.le_next; \ -} while (/*CONSTCOND*/0) - -#define LIST_INSERT_HEAD(head, elm, field) do { \ - QUEUEDEBUG_LIST_INSERT_HEAD((head), (elm), field) \ - if (((elm)->field.le_next = (head)->lh_first) != LIST_END(head))\ - (head)->lh_first->field.le_prev = &(elm)->field.le_next;\ - (head)->lh_first = (elm); \ - (elm)->field.le_prev = &(head)->lh_first; \ -} while (/*CONSTCOND*/0) - -#define LIST_REMOVE(elm, field) do { \ - QUEUEDEBUG_LIST_OP((elm), field) \ - if ((elm)->field.le_next != NULL) \ - (elm)->field.le_next->field.le_prev = \ - (elm)->field.le_prev; \ - *(elm)->field.le_prev = (elm)->field.le_next; \ - QUEUEDEBUG_LIST_POSTREMOVE((elm), field) \ -} while (/*CONSTCOND*/0) - -#define LIST_REPLACE(elm, elm2, field) do { \ - if (((elm2)->field.le_next = (elm)->field.le_next) != NULL) \ - (elm2)->field.le_next->field.le_prev = \ - &(elm2)->field.le_next; \ - (elm2)->field.le_prev = (elm)->field.le_prev; \ - *(elm2)->field.le_prev = (elm2); \ - QUEUEDEBUG_LIST_POSTREMOVE((elm), field) \ -} while (/*CONSTCOND*/0) - -/* - * Simple queue definitions. - */ -#define SIMPLEQ_HEAD(name, type) \ -struct name { \ - struct type *sqh_first; /* first element */ \ - struct type **sqh_last; /* addr of last next element */ \ -} - -#define SIMPLEQ_HEAD_INITIALIZER(head) \ - { NULL, &(head).sqh_first } - -#define SIMPLEQ_ENTRY(type) \ -struct { \ - struct type *sqe_next; /* next element */ \ -} - -/* - * Simple queue access methods. - */ -#define SIMPLEQ_FIRST(head) ((head)->sqh_first) -#define SIMPLEQ_END(head) NULL -#define SIMPLEQ_EMPTY(head) ((head)->sqh_first == SIMPLEQ_END(head)) -#define SIMPLEQ_NEXT(elm, field) ((elm)->field.sqe_next) - -#define SIMPLEQ_FOREACH(var, head, field) \ - for ((var) = ((head)->sqh_first); \ - (var) != SIMPLEQ_END(head); \ - (var) = ((var)->field.sqe_next)) - -#define SIMPLEQ_FOREACH_SAFE(var, head, field, next) \ - for ((var) = ((head)->sqh_first); \ - (var) != SIMPLEQ_END(head) && \ - ((next = ((var)->field.sqe_next)), 1); \ - (var) = (next)) - -/* - * Simple queue functions. - */ -#define SIMPLEQ_INIT(head) do { \ - (head)->sqh_first = NULL; \ - (head)->sqh_last = &(head)->sqh_first; \ -} while (/*CONSTCOND*/0) - -#define SIMPLEQ_INSERT_HEAD(head, elm, field) do { \ - if (((elm)->field.sqe_next = (head)->sqh_first) == NULL) \ - (head)->sqh_last = &(elm)->field.sqe_next; \ - (head)->sqh_first = (elm); \ -} while (/*CONSTCOND*/0) - -#define SIMPLEQ_INSERT_TAIL(head, elm, field) do { \ - (elm)->field.sqe_next = NULL; \ - *(head)->sqh_last = (elm); \ - (head)->sqh_last = &(elm)->field.sqe_next; \ -} while (/*CONSTCOND*/0) - -#define SIMPLEQ_INSERT_AFTER(head, listelm, elm, field) do { \ - if (((elm)->field.sqe_next = (listelm)->field.sqe_next) == NULL)\ - (head)->sqh_last = &(elm)->field.sqe_next; \ - (listelm)->field.sqe_next = (elm); \ -} while (/*CONSTCOND*/0) - -#define SIMPLEQ_REMOVE_HEAD(head, field) do { \ - if (((head)->sqh_first = (head)->sqh_first->field.sqe_next) == NULL) \ - (head)->sqh_last = &(head)->sqh_first; \ -} while (/*CONSTCOND*/0) - -#define SIMPLEQ_REMOVE_AFTER(head, elm, field) do { \ - if (((elm)->field.sqe_next = (elm)->field.sqe_next->field.sqe_next) \ - == NULL) \ - (head)->sqh_last = &(elm)->field.sqe_next; \ -} while (/*CONSTCOND*/0) - -#define SIMPLEQ_REMOVE(head, elm, type, field) do { \ - if ((head)->sqh_first == (elm)) { \ - SIMPLEQ_REMOVE_HEAD((head), field); \ - } else { \ - struct type *curelm = (head)->sqh_first; \ - while (curelm->field.sqe_next != (elm)) \ - curelm = curelm->field.sqe_next; \ - if ((curelm->field.sqe_next = \ - curelm->field.sqe_next->field.sqe_next) == NULL) \ - (head)->sqh_last = &(curelm)->field.sqe_next; \ - } \ -} while (/*CONSTCOND*/0) - -#define SIMPLEQ_CONCAT(head1, head2) do { \ - if (!SIMPLEQ_EMPTY((head2))) { \ - *(head1)->sqh_last = (head2)->sqh_first; \ - (head1)->sqh_last = (head2)->sqh_last; \ - SIMPLEQ_INIT((head2)); \ - } \ -} while (/*CONSTCOND*/0) - -#define SIMPLEQ_LAST(head, type, field) \ - (SIMPLEQ_EMPTY((head)) ? \ - NULL : \ - ((struct type *)(void *) \ - ((char *)((head)->sqh_last) - offsetof(struct type, field)))) - -/* - * Tail queue definitions. - */ -#define _TAILQ_HEAD(name, type, qual) \ -struct name { \ - qual type *tqh_first; /* first element */ \ - qual type *qual *tqh_last; /* addr of last next element */ \ -} -#define TAILQ_HEAD(name, type) _TAILQ_HEAD(name, struct type,) - -#define TAILQ_HEAD_INITIALIZER(head) \ - { TAILQ_END(head), &(head).tqh_first } - -#define _TAILQ_ENTRY(type, qual) \ -struct { \ - qual type *tqe_next; /* next element */ \ - qual type *qual *tqe_prev; /* address of previous next element */\ -} -#define TAILQ_ENTRY(type) _TAILQ_ENTRY(struct type,) - -/* - * Tail queue access methods. - */ -#define TAILQ_FIRST(head) ((head)->tqh_first) -#define TAILQ_END(head) (NULL) -#define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next) -#define TAILQ_LAST(head, headname) \ - (*(((struct headname *)(void *)((head)->tqh_last))->tqh_last)) -#define TAILQ_PREV(elm, headname, field) \ - (*(((struct headname *)(void *)((elm)->field.tqe_prev))->tqh_last)) -#define TAILQ_EMPTY(head) (TAILQ_FIRST(head) == TAILQ_END(head)) - - -#define TAILQ_FOREACH(var, head, field) \ - for ((var) = ((head)->tqh_first); \ - (var) != TAILQ_END(head); \ - (var) = ((var)->field.tqe_next)) - -#define TAILQ_FOREACH_SAFE(var, head, field, next) \ - for ((var) = ((head)->tqh_first); \ - (var) != TAILQ_END(head) && \ - ((next) = TAILQ_NEXT(var, field), 1); (var) = (next)) - -#define TAILQ_FOREACH_REVERSE(var, head, headname, field) \ - for ((var) = TAILQ_LAST((head), headname); \ - (var) != TAILQ_END(head); \ - (var) = TAILQ_PREV((var), headname, field)) - -#define TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, prev) \ - for ((var) = TAILQ_LAST((head), headname); \ - (var) != TAILQ_END(head) && \ - ((prev) = TAILQ_PREV((var), headname, field), 1); (var) = (prev)) - -/* - * Tail queue functions. - */ -#if defined(QUEUEDEBUG) -#define QUEUEDEBUG_TAILQ_INSERT_HEAD(head, elm, field) \ - if ((head)->tqh_first && \ - (head)->tqh_first->field.tqe_prev != &(head)->tqh_first) \ - QUEUEDEBUG_ABORT("TAILQ_INSERT_HEAD %p %s:%d", (head), \ - __FILE__, __LINE__); -#define QUEUEDEBUG_TAILQ_INSERT_TAIL(head, elm, field) \ - if (*(head)->tqh_last != NULL) \ - QUEUEDEBUG_ABORT("TAILQ_INSERT_TAIL %p %s:%d", (head), \ - __FILE__, __LINE__); -#define QUEUEDEBUG_TAILQ_OP(elm, field) \ - if ((elm)->field.tqe_next && \ - (elm)->field.tqe_next->field.tqe_prev != \ - &(elm)->field.tqe_next) \ - QUEUEDEBUG_ABORT("TAILQ_* forw %p %s:%d", (elm), \ - __FILE__, __LINE__); \ - if (*(elm)->field.tqe_prev != (elm)) \ - QUEUEDEBUG_ABORT("TAILQ_* back %p %s:%d", (elm), \ - __FILE__, __LINE__); -#define QUEUEDEBUG_TAILQ_PREREMOVE(head, elm, field) \ - if ((elm)->field.tqe_next == NULL && \ - (head)->tqh_last != &(elm)->field.tqe_next) \ - QUEUEDEBUG_ABORT("TAILQ_PREREMOVE head %p elm %p %s:%d",\ - (head), (elm), __FILE__, __LINE__); -#define QUEUEDEBUG_TAILQ_POSTREMOVE(elm, field) \ - (elm)->field.tqe_next = (void *)1L; \ - (elm)->field.tqe_prev = (void *)1L; -#else -#define QUEUEDEBUG_TAILQ_INSERT_HEAD(head, elm, field) -#define QUEUEDEBUG_TAILQ_INSERT_TAIL(head, elm, field) -#define QUEUEDEBUG_TAILQ_OP(elm, field) -#define QUEUEDEBUG_TAILQ_PREREMOVE(head, elm, field) -#define QUEUEDEBUG_TAILQ_POSTREMOVE(elm, field) -#endif - -#define TAILQ_INIT(head) do { \ - (head)->tqh_first = TAILQ_END(head); \ - (head)->tqh_last = &(head)->tqh_first; \ -} while (/*CONSTCOND*/0) - -#define TAILQ_INSERT_HEAD(head, elm, field) do { \ - QUEUEDEBUG_TAILQ_INSERT_HEAD((head), (elm), field) \ - if (((elm)->field.tqe_next = (head)->tqh_first) != TAILQ_END(head))\ - (head)->tqh_first->field.tqe_prev = \ - &(elm)->field.tqe_next; \ - else \ - (head)->tqh_last = &(elm)->field.tqe_next; \ - (head)->tqh_first = (elm); \ - (elm)->field.tqe_prev = &(head)->tqh_first; \ -} while (/*CONSTCOND*/0) - -#define TAILQ_INSERT_TAIL(head, elm, field) do { \ - QUEUEDEBUG_TAILQ_INSERT_TAIL((head), (elm), field) \ - (elm)->field.tqe_next = TAILQ_END(head); \ - (elm)->field.tqe_prev = (head)->tqh_last; \ - *(head)->tqh_last = (elm); \ - (head)->tqh_last = &(elm)->field.tqe_next; \ -} while (/*CONSTCOND*/0) - -#define TAILQ_INSERT_AFTER(head, listelm, elm, field) do { \ - QUEUEDEBUG_TAILQ_OP((listelm), field) \ - if (((elm)->field.tqe_next = (listelm)->field.tqe_next) != \ - TAILQ_END(head)) \ - (elm)->field.tqe_next->field.tqe_prev = \ - &(elm)->field.tqe_next; \ - else \ - (head)->tqh_last = &(elm)->field.tqe_next; \ - (listelm)->field.tqe_next = (elm); \ - (elm)->field.tqe_prev = &(listelm)->field.tqe_next; \ -} while (/*CONSTCOND*/0) - -#define TAILQ_INSERT_BEFORE(listelm, elm, field) do { \ - QUEUEDEBUG_TAILQ_OP((listelm), field) \ - (elm)->field.tqe_prev = (listelm)->field.tqe_prev; \ - (elm)->field.tqe_next = (listelm); \ - *(listelm)->field.tqe_prev = (elm); \ - (listelm)->field.tqe_prev = &(elm)->field.tqe_next; \ -} while (/*CONSTCOND*/0) - -#define TAILQ_REMOVE(head, elm, field) do { \ - QUEUEDEBUG_TAILQ_PREREMOVE((head), (elm), field) \ - QUEUEDEBUG_TAILQ_OP((elm), field) \ - if (((elm)->field.tqe_next) != TAILQ_END(head)) \ - (elm)->field.tqe_next->field.tqe_prev = \ - (elm)->field.tqe_prev; \ - else \ - (head)->tqh_last = (elm)->field.tqe_prev; \ - *(elm)->field.tqe_prev = (elm)->field.tqe_next; \ - QUEUEDEBUG_TAILQ_POSTREMOVE((elm), field); \ -} while (/*CONSTCOND*/0) - -#define TAILQ_REPLACE(head, elm, elm2, field) do { \ - if (((elm2)->field.tqe_next = (elm)->field.tqe_next) != \ - TAILQ_END(head)) \ - (elm2)->field.tqe_next->field.tqe_prev = \ - &(elm2)->field.tqe_next; \ - else \ - (head)->tqh_last = &(elm2)->field.tqe_next; \ - (elm2)->field.tqe_prev = (elm)->field.tqe_prev; \ - *(elm2)->field.tqe_prev = (elm2); \ - QUEUEDEBUG_TAILQ_POSTREMOVE((elm), field); \ -} while (/*CONSTCOND*/0) - -#define TAILQ_CONCAT(head1, head2, field) do { \ - if (!TAILQ_EMPTY(head2)) { \ - *(head1)->tqh_last = (head2)->tqh_first; \ - (head2)->tqh_first->field.tqe_prev = (head1)->tqh_last; \ - (head1)->tqh_last = (head2)->tqh_last; \ - TAILQ_INIT((head2)); \ - } \ -} while (/*CONSTCOND*/0) - -/* - * Singly-linked Tail queue declarations. - */ -#define STAILQ_HEAD(name, type) \ -struct name { \ - struct type *stqh_first; /* first element */ \ - struct type **stqh_last; /* addr of last next element */ \ -} - -#define STAILQ_HEAD_INITIALIZER(head) \ - { NULL, &(head).stqh_first } - -#define STAILQ_ENTRY(type) \ -struct { \ - struct type *stqe_next; /* next element */ \ -} - -/* - * Singly-linked Tail queue access methods. - */ -#define STAILQ_FIRST(head) ((head)->stqh_first) -#define STAILQ_END(head) NULL -#define STAILQ_NEXT(elm, field) ((elm)->field.stqe_next) -#define STAILQ_EMPTY(head) (STAILQ_FIRST(head) == STAILQ_END(head)) - -/* - * Singly-linked Tail queue functions. - */ -#define STAILQ_INIT(head) do { \ - (head)->stqh_first = NULL; \ - (head)->stqh_last = &(head)->stqh_first; \ -} while (/*CONSTCOND*/0) - -#define STAILQ_INSERT_HEAD(head, elm, field) do { \ - if (((elm)->field.stqe_next = (head)->stqh_first) == NULL) \ - (head)->stqh_last = &(elm)->field.stqe_next; \ - (head)->stqh_first = (elm); \ -} while (/*CONSTCOND*/0) - -#define STAILQ_INSERT_TAIL(head, elm, field) do { \ - (elm)->field.stqe_next = NULL; \ - *(head)->stqh_last = (elm); \ - (head)->stqh_last = &(elm)->field.stqe_next; \ -} while (/*CONSTCOND*/0) - -#define STAILQ_INSERT_AFTER(head, listelm, elm, field) do { \ - if (((elm)->field.stqe_next = (listelm)->field.stqe_next) == NULL)\ - (head)->stqh_last = &(elm)->field.stqe_next; \ - (listelm)->field.stqe_next = (elm); \ -} while (/*CONSTCOND*/0) - -#define STAILQ_REMOVE_HEAD(head, field) do { \ - if (((head)->stqh_first = (head)->stqh_first->field.stqe_next) == NULL) \ - (head)->stqh_last = &(head)->stqh_first; \ -} while (/*CONSTCOND*/0) - -#define STAILQ_REMOVE(head, elm, type, field) do { \ - if ((head)->stqh_first == (elm)) { \ - STAILQ_REMOVE_HEAD((head), field); \ - } else { \ - struct type *curelm = (head)->stqh_first; \ - while (curelm->field.stqe_next != (elm)) \ - curelm = curelm->field.stqe_next; \ - if ((curelm->field.stqe_next = \ - curelm->field.stqe_next->field.stqe_next) == NULL) \ - (head)->stqh_last = &(curelm)->field.stqe_next; \ - } \ -} while (/*CONSTCOND*/0) - -#define STAILQ_FOREACH(var, head, field) \ - for ((var) = ((head)->stqh_first); \ - (var); \ - (var) = ((var)->field.stqe_next)) - -#define STAILQ_FOREACH_SAFE(var, head, field, tvar) \ - for ((var) = STAILQ_FIRST((head)); \ - (var) && ((tvar) = STAILQ_NEXT((var), field), 1); \ - (var) = (tvar)) - -#define STAILQ_CONCAT(head1, head2) do { \ - if (!STAILQ_EMPTY((head2))) { \ - *(head1)->stqh_last = (head2)->stqh_first; \ - (head1)->stqh_last = (head2)->stqh_last; \ - STAILQ_INIT((head2)); \ - } \ -} while (/*CONSTCOND*/0) - -#define STAILQ_LAST(head, type, field) \ - (STAILQ_EMPTY((head)) ? \ - NULL : \ - ((struct type *)(void *) \ - ((char *)((head)->stqh_last) - offsetof(struct type, field)))) - - -#ifndef _KERNEL -/* - * Circular queue definitions. Do not use. We still keep the macros - * for compatibility but because of pointer aliasing issues their use - * is discouraged! - */ - -/* - * __launder_type(): We use this ugly hack to work around the the compiler - * noticing that two types may not alias each other and elide tests in code. - * We hit this in the CIRCLEQ macros when comparing 'struct name *' and - * 'struct type *' (see CIRCLEQ_HEAD()). Modern compilers (such as GCC - * 4.8) declare these comparisons as always false, causing the code to - * not run as designed. - * - * This hack is only to be used for comparisons and thus can be fully const. - * Do not use for assignment. - * - * If we ever choose to change the ABI of the CIRCLEQ macros, we could fix - * this by changing the head/tail sentinal values, but see the note above - * this one. - */ -static __inline const void * __launder_type(const void *); -static __inline const void * -__launder_type(const void *__x) -{ - __asm __volatile("" : "+r" (__x)); - return __x; -} - -#if defined(QUEUEDEBUG) -#define QUEUEDEBUG_CIRCLEQ_HEAD(head, field) \ - if ((head)->cqh_first != CIRCLEQ_ENDC(head) && \ - (head)->cqh_first->field.cqe_prev != CIRCLEQ_ENDC(head)) \ - QUEUEDEBUG_ABORT("CIRCLEQ head forw %p %s:%d", (head), \ - __FILE__, __LINE__); \ - if ((head)->cqh_last != CIRCLEQ_ENDC(head) && \ - (head)->cqh_last->field.cqe_next != CIRCLEQ_ENDC(head)) \ - QUEUEDEBUG_ABORT("CIRCLEQ head back %p %s:%d", (head), \ - __FILE__, __LINE__); -#define QUEUEDEBUG_CIRCLEQ_ELM(head, elm, field) \ - if ((elm)->field.cqe_next == CIRCLEQ_ENDC(head)) { \ - if ((head)->cqh_last != (elm)) \ - QUEUEDEBUG_ABORT("CIRCLEQ elm last %p %s:%d", \ - (elm), __FILE__, __LINE__); \ - } else { \ - if ((elm)->field.cqe_next->field.cqe_prev != (elm)) \ - QUEUEDEBUG_ABORT("CIRCLEQ elm forw %p %s:%d", \ - (elm), __FILE__, __LINE__); \ - } \ - if ((elm)->field.cqe_prev == CIRCLEQ_ENDC(head)) { \ - if ((head)->cqh_first != (elm)) \ - QUEUEDEBUG_ABORT("CIRCLEQ elm first %p %s:%d", \ - (elm), __FILE__, __LINE__); \ - } else { \ - if ((elm)->field.cqe_prev->field.cqe_next != (elm)) \ - QUEUEDEBUG_ABORT("CIRCLEQ elm prev %p %s:%d", \ - (elm), __FILE__, __LINE__); \ - } -#define QUEUEDEBUG_CIRCLEQ_POSTREMOVE(elm, field) \ - (elm)->field.cqe_next = (void *)1L; \ - (elm)->field.cqe_prev = (void *)1L; -#else -#define QUEUEDEBUG_CIRCLEQ_HEAD(head, field) -#define QUEUEDEBUG_CIRCLEQ_ELM(head, elm, field) -#define QUEUEDEBUG_CIRCLEQ_POSTREMOVE(elm, field) -#endif - -#define CIRCLEQ_HEAD(name, type) \ -struct name { \ - struct type *cqh_first; /* first element */ \ - struct type *cqh_last; /* last element */ \ -} - -#define CIRCLEQ_HEAD_INITIALIZER(head) \ - { CIRCLEQ_END(&head), CIRCLEQ_END(&head) } - -#define CIRCLEQ_ENTRY(type) \ -struct { \ - struct type *cqe_next; /* next element */ \ - struct type *cqe_prev; /* previous element */ \ -} - -/* - * Circular queue functions. - */ -#define CIRCLEQ_INIT(head) do { \ - (head)->cqh_first = CIRCLEQ_END(head); \ - (head)->cqh_last = CIRCLEQ_END(head); \ -} while (/*CONSTCOND*/0) - -#define CIRCLEQ_INSERT_AFTER(head, listelm, elm, field) do { \ - QUEUEDEBUG_CIRCLEQ_HEAD((head), field) \ - QUEUEDEBUG_CIRCLEQ_ELM((head), (listelm), field) \ - (elm)->field.cqe_next = (listelm)->field.cqe_next; \ - (elm)->field.cqe_prev = (listelm); \ - if ((listelm)->field.cqe_next == CIRCLEQ_ENDC(head)) \ - (head)->cqh_last = (elm); \ - else \ - (listelm)->field.cqe_next->field.cqe_prev = (elm); \ - (listelm)->field.cqe_next = (elm); \ -} while (/*CONSTCOND*/0) - -#define CIRCLEQ_INSERT_BEFORE(head, listelm, elm, field) do { \ - QUEUEDEBUG_CIRCLEQ_HEAD((head), field) \ - QUEUEDEBUG_CIRCLEQ_ELM((head), (listelm), field) \ - (elm)->field.cqe_next = (listelm); \ - (elm)->field.cqe_prev = (listelm)->field.cqe_prev; \ - if ((listelm)->field.cqe_prev == CIRCLEQ_ENDC(head)) \ - (head)->cqh_first = (elm); \ - else \ - (listelm)->field.cqe_prev->field.cqe_next = (elm); \ - (listelm)->field.cqe_prev = (elm); \ -} while (/*CONSTCOND*/0) - -#define CIRCLEQ_INSERT_HEAD(head, elm, field) do { \ - QUEUEDEBUG_CIRCLEQ_HEAD((head), field) \ - (elm)->field.cqe_next = (head)->cqh_first; \ - (elm)->field.cqe_prev = CIRCLEQ_END(head); \ - if ((head)->cqh_last == CIRCLEQ_ENDC(head)) \ - (head)->cqh_last = (elm); \ - else \ - (head)->cqh_first->field.cqe_prev = (elm); \ - (head)->cqh_first = (elm); \ -} while (/*CONSTCOND*/0) - -#define CIRCLEQ_INSERT_TAIL(head, elm, field) do { \ - QUEUEDEBUG_CIRCLEQ_HEAD((head), field) \ - (elm)->field.cqe_next = CIRCLEQ_END(head); \ - (elm)->field.cqe_prev = (head)->cqh_last; \ - if ((head)->cqh_first == CIRCLEQ_ENDC(head)) \ - (head)->cqh_first = (elm); \ - else \ - (head)->cqh_last->field.cqe_next = (elm); \ - (head)->cqh_last = (elm); \ -} while (/*CONSTCOND*/0) - -#define CIRCLEQ_REMOVE(head, elm, field) do { \ - QUEUEDEBUG_CIRCLEQ_HEAD((head), field) \ - QUEUEDEBUG_CIRCLEQ_ELM((head), (elm), field) \ - if ((elm)->field.cqe_next == CIRCLEQ_ENDC(head)) \ - (head)->cqh_last = (elm)->field.cqe_prev; \ - else \ - (elm)->field.cqe_next->field.cqe_prev = \ - (elm)->field.cqe_prev; \ - if ((elm)->field.cqe_prev == CIRCLEQ_ENDC(head)) \ - (head)->cqh_first = (elm)->field.cqe_next; \ - else \ - (elm)->field.cqe_prev->field.cqe_next = \ - (elm)->field.cqe_next; \ - QUEUEDEBUG_CIRCLEQ_POSTREMOVE((elm), field) \ -} while (/*CONSTCOND*/0) - -#define CIRCLEQ_FOREACH(var, head, field) \ - for ((var) = ((head)->cqh_first); \ - (var) != CIRCLEQ_ENDC(head); \ - (var) = ((var)->field.cqe_next)) - -#define CIRCLEQ_FOREACH_REVERSE(var, head, field) \ - for ((var) = ((head)->cqh_last); \ - (var) != CIRCLEQ_ENDC(head); \ - (var) = ((var)->field.cqe_prev)) - -/* - * Circular queue access methods. - */ -#define CIRCLEQ_FIRST(head) ((head)->cqh_first) -#define CIRCLEQ_LAST(head) ((head)->cqh_last) -/* For comparisons */ -#define CIRCLEQ_ENDC(head) (__launder_type(head)) -/* For assignments */ -#define CIRCLEQ_END(head) ((void *)(head)) -#define CIRCLEQ_NEXT(elm, field) ((elm)->field.cqe_next) -#define CIRCLEQ_PREV(elm, field) ((elm)->field.cqe_prev) -#define CIRCLEQ_EMPTY(head) \ - (CIRCLEQ_FIRST(head) == CIRCLEQ_ENDC(head)) - -#define CIRCLEQ_LOOP_NEXT(head, elm, field) \ - (((elm)->field.cqe_next == CIRCLEQ_ENDC(head)) \ - ? ((head)->cqh_first) \ - : (elm->field.cqe_next)) -#define CIRCLEQ_LOOP_PREV(head, elm, field) \ - (((elm)->field.cqe_prev == CIRCLEQ_ENDC(head)) \ - ? ((head)->cqh_last) \ - : (elm->field.cqe_prev)) -#endif /* !_KERNEL */ - -#endif /* !_SYS_QUEUE_H_ */ diff --git a/testing/bsd-compat-headers/files/tree.h b/testing/bsd-compat-headers/files/tree.h deleted file mode 100644 index eaea56aa..00000000 --- a/testing/bsd-compat-headers/files/tree.h +++ /dev/null @@ -1,761 +0,0 @@ -/* $NetBSD: tree.h,v 1.20 2013/09/14 13:20:45 joerg Exp $ */ -/* $OpenBSD: tree.h,v 1.13 2011/07/09 00:19:45 pirofti Exp $ */ -/* - * Copyright 2002 Niels Provos - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _SYS_TREE_H_ -#define _SYS_TREE_H_ - -/* - * This file defines data structures for different types of trees: - * splay trees and red-black trees. - * - * A splay tree is a self-organizing data structure. Every operation - * on the tree causes a splay to happen. The splay moves the requested - * node to the root of the tree and partly rebalances it. - * - * This has the benefit that request locality causes faster lookups as - * the requested nodes move to the top of the tree. On the other hand, - * every lookup causes memory writes. - * - * The Balance Theorem bounds the total access time for m operations - * and n inserts on an initially empty tree as O((m + n)lg n). The - * amortized cost for a sequence of m accesses to a splay tree is O(lg n); - * - * A red-black tree is a binary search tree with the node color as an - * extra attribute. It fulfills a set of conditions: - * - every search path from the root to a leaf consists of the - * same number of black nodes, - * - each red node (except for the root) has a black parent, - * - each leaf node is black. - * - * Every operation on a red-black tree is bounded as O(lg n). - * The maximum height of a red-black tree is 2lg (n+1). - */ - -#define SPLAY_HEAD(name, type) \ -struct name { \ - struct type *sph_root; /* root of the tree */ \ -} - -#define SPLAY_INITIALIZER(root) \ - { NULL } - -#define SPLAY_INIT(root) do { \ - (root)->sph_root = NULL; \ -} while (/*CONSTCOND*/ 0) - -#define SPLAY_ENTRY(type) \ -struct { \ - struct type *spe_left; /* left element */ \ - struct type *spe_right; /* right element */ \ -} - -#define SPLAY_LEFT(elm, field) (elm)->field.spe_left -#define SPLAY_RIGHT(elm, field) (elm)->field.spe_right -#define SPLAY_ROOT(head) (head)->sph_root -#define SPLAY_EMPTY(head) (SPLAY_ROOT(head) == NULL) - -/* SPLAY_ROTATE_{LEFT,RIGHT} expect that tmp hold SPLAY_{RIGHT,LEFT} */ -#define SPLAY_ROTATE_RIGHT(head, tmp, field) do { \ - SPLAY_LEFT((head)->sph_root, field) = SPLAY_RIGHT(tmp, field); \ - SPLAY_RIGHT(tmp, field) = (head)->sph_root; \ - (head)->sph_root = tmp; \ -} while (/*CONSTCOND*/ 0) - -#define SPLAY_ROTATE_LEFT(head, tmp, field) do { \ - SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(tmp, field); \ - SPLAY_LEFT(tmp, field) = (head)->sph_root; \ - (head)->sph_root = tmp; \ -} while (/*CONSTCOND*/ 0) - -#define SPLAY_LINKLEFT(head, tmp, field) do { \ - SPLAY_LEFT(tmp, field) = (head)->sph_root; \ - tmp = (head)->sph_root; \ - (head)->sph_root = SPLAY_LEFT((head)->sph_root, field); \ -} while (/*CONSTCOND*/ 0) - -#define SPLAY_LINKRIGHT(head, tmp, field) do { \ - SPLAY_RIGHT(tmp, field) = (head)->sph_root; \ - tmp = (head)->sph_root; \ - (head)->sph_root = SPLAY_RIGHT((head)->sph_root, field); \ -} while (/*CONSTCOND*/ 0) - -#define SPLAY_ASSEMBLE(head, node, left, right, field) do { \ - SPLAY_RIGHT(left, field) = SPLAY_LEFT((head)->sph_root, field); \ - SPLAY_LEFT(right, field) = SPLAY_RIGHT((head)->sph_root, field);\ - SPLAY_LEFT((head)->sph_root, field) = SPLAY_RIGHT(node, field); \ - SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(node, field); \ -} while (/*CONSTCOND*/ 0) - -/* Generates prototypes and inline functions */ - -#define SPLAY_PROTOTYPE(name, type, field, cmp) \ -void name##_SPLAY(struct name *, struct type *); \ -void name##_SPLAY_MINMAX(struct name *, int); \ -struct type *name##_SPLAY_INSERT(struct name *, struct type *); \ -struct type *name##_SPLAY_REMOVE(struct name *, struct type *); \ - \ -/* Finds the node with the same key as elm */ \ -static __inline struct type * \ -name##_SPLAY_FIND(struct name *head, struct type *elm) \ -{ \ - if (SPLAY_EMPTY(head)) \ - return(NULL); \ - name##_SPLAY(head, elm); \ - if ((cmp)(elm, (head)->sph_root) == 0) \ - return (head->sph_root); \ - return (NULL); \ -} \ - \ -static __inline __unused struct type * \ -name##_SPLAY_NEXT(struct name *head, struct type *elm) \ -{ \ - name##_SPLAY(head, elm); \ - if (SPLAY_RIGHT(elm, field) != NULL) { \ - elm = SPLAY_RIGHT(elm, field); \ - while (SPLAY_LEFT(elm, field) != NULL) { \ - elm = SPLAY_LEFT(elm, field); \ - } \ - } else \ - elm = NULL; \ - return (elm); \ -} \ - \ -static __unused __inline struct type * \ -name##_SPLAY_MIN_MAX(struct name *head, int val) \ -{ \ - name##_SPLAY_MINMAX(head, val); \ - return (SPLAY_ROOT(head)); \ -} - -/* Main splay operation. - * Moves node close to the key of elm to top - */ -#define SPLAY_GENERATE(name, type, field, cmp) \ -struct type * \ -name##_SPLAY_INSERT(struct name *head, struct type *elm) \ -{ \ - if (SPLAY_EMPTY(head)) { \ - SPLAY_LEFT(elm, field) = SPLAY_RIGHT(elm, field) = NULL; \ - } else { \ - int __comp; \ - name##_SPLAY(head, elm); \ - __comp = (cmp)(elm, (head)->sph_root); \ - if(__comp < 0) { \ - SPLAY_LEFT(elm, field) = SPLAY_LEFT((head)->sph_root, field);\ - SPLAY_RIGHT(elm, field) = (head)->sph_root; \ - SPLAY_LEFT((head)->sph_root, field) = NULL; \ - } else if (__comp > 0) { \ - SPLAY_RIGHT(elm, field) = SPLAY_RIGHT((head)->sph_root, field);\ - SPLAY_LEFT(elm, field) = (head)->sph_root; \ - SPLAY_RIGHT((head)->sph_root, field) = NULL; \ - } else \ - return ((head)->sph_root); \ - } \ - (head)->sph_root = (elm); \ - return (NULL); \ -} \ - \ -struct type * \ -name##_SPLAY_REMOVE(struct name *head, struct type *elm) \ -{ \ - struct type *__tmp; \ - if (SPLAY_EMPTY(head)) \ - return (NULL); \ - name##_SPLAY(head, elm); \ - if ((cmp)(elm, (head)->sph_root) == 0) { \ - if (SPLAY_LEFT((head)->sph_root, field) == NULL) { \ - (head)->sph_root = SPLAY_RIGHT((head)->sph_root, field);\ - } else { \ - __tmp = SPLAY_RIGHT((head)->sph_root, field); \ - (head)->sph_root = SPLAY_LEFT((head)->sph_root, field);\ - name##_SPLAY(head, elm); \ - SPLAY_RIGHT((head)->sph_root, field) = __tmp; \ - } \ - return (elm); \ - } \ - return (NULL); \ -} \ - \ -void \ -name##_SPLAY(struct name *head, struct type *elm) \ -{ \ - struct type __node, *__left, *__right, *__tmp; \ - int __comp; \ -\ - SPLAY_LEFT(&__node, field) = SPLAY_RIGHT(&__node, field) = NULL;\ - __left = __right = &__node; \ -\ - while ((__comp = (cmp)(elm, (head)->sph_root)) != 0) { \ - if (__comp < 0) { \ - __tmp = SPLAY_LEFT((head)->sph_root, field); \ - if (__tmp == NULL) \ - break; \ - if ((cmp)(elm, __tmp) < 0){ \ - SPLAY_ROTATE_RIGHT(head, __tmp, field); \ - if (SPLAY_LEFT((head)->sph_root, field) == NULL)\ - break; \ - } \ - SPLAY_LINKLEFT(head, __right, field); \ - } else if (__comp > 0) { \ - __tmp = SPLAY_RIGHT((head)->sph_root, field); \ - if (__tmp == NULL) \ - break; \ - if ((cmp)(elm, __tmp) > 0){ \ - SPLAY_ROTATE_LEFT(head, __tmp, field); \ - if (SPLAY_RIGHT((head)->sph_root, field) == NULL)\ - break; \ - } \ - SPLAY_LINKRIGHT(head, __left, field); \ - } \ - } \ - SPLAY_ASSEMBLE(head, &__node, __left, __right, field); \ -} \ - \ -/* Splay with either the minimum or the maximum element \ - * Used to find minimum or maximum element in tree. \ - */ \ -void name##_SPLAY_MINMAX(struct name *head, int __comp) \ -{ \ - struct type __node, *__left, *__right, *__tmp; \ -\ - SPLAY_LEFT(&__node, field) = SPLAY_RIGHT(&__node, field) = NULL;\ - __left = __right = &__node; \ -\ - while (1) { \ - if (__comp < 0) { \ - __tmp = SPLAY_LEFT((head)->sph_root, field); \ - if (__tmp == NULL) \ - break; \ - if (__comp < 0){ \ - SPLAY_ROTATE_RIGHT(head, __tmp, field); \ - if (SPLAY_LEFT((head)->sph_root, field) == NULL)\ - break; \ - } \ - SPLAY_LINKLEFT(head, __right, field); \ - } else if (__comp > 0) { \ - __tmp = SPLAY_RIGHT((head)->sph_root, field); \ - if (__tmp == NULL) \ - break; \ - if (__comp > 0) { \ - SPLAY_ROTATE_LEFT(head, __tmp, field); \ - if (SPLAY_RIGHT((head)->sph_root, field) == NULL)\ - break; \ - } \ - SPLAY_LINKRIGHT(head, __left, field); \ - } \ - } \ - SPLAY_ASSEMBLE(head, &__node, __left, __right, field); \ -} - -#define SPLAY_NEGINF -1 -#define SPLAY_INF 1 - -#define SPLAY_INSERT(name, x, y) name##_SPLAY_INSERT(x, y) -#define SPLAY_REMOVE(name, x, y) name##_SPLAY_REMOVE(x, y) -#define SPLAY_FIND(name, x, y) name##_SPLAY_FIND(x, y) -#define SPLAY_NEXT(name, x, y) name##_SPLAY_NEXT(x, y) -#define SPLAY_MIN(name, x) (SPLAY_EMPTY(x) ? NULL \ - : name##_SPLAY_MIN_MAX(x, SPLAY_NEGINF)) -#define SPLAY_MAX(name, x) (SPLAY_EMPTY(x) ? NULL \ - : name##_SPLAY_MIN_MAX(x, SPLAY_INF)) - -#define SPLAY_FOREACH(x, name, head) \ - for ((x) = SPLAY_MIN(name, head); \ - (x) != NULL; \ - (x) = SPLAY_NEXT(name, head, x)) - -/* Macros that define a red-black tree */ -#define RB_HEAD(name, type) \ -struct name { \ - struct type *rbh_root; /* root of the tree */ \ -} - -#define RB_INITIALIZER(root) \ - { NULL } - -#define RB_INIT(root) do { \ - (root)->rbh_root = NULL; \ -} while (/*CONSTCOND*/ 0) - -#define RB_BLACK 0 -#define RB_RED 1 -#define RB_ENTRY(type) \ -struct { \ - struct type *rbe_left; /* left element */ \ - struct type *rbe_right; /* right element */ \ - struct type *rbe_parent; /* parent element */ \ - int rbe_color; /* node color */ \ -} - -#define RB_LEFT(elm, field) (elm)->field.rbe_left -#define RB_RIGHT(elm, field) (elm)->field.rbe_right -#define RB_PARENT(elm, field) (elm)->field.rbe_parent -#define RB_COLOR(elm, field) (elm)->field.rbe_color -#define RB_ROOT(head) (head)->rbh_root -#define RB_EMPTY(head) (RB_ROOT(head) == NULL) - -#define RB_SET(elm, parent, field) do { \ - RB_PARENT(elm, field) = parent; \ - RB_LEFT(elm, field) = RB_RIGHT(elm, field) = NULL; \ - RB_COLOR(elm, field) = RB_RED; \ -} while (/*CONSTCOND*/ 0) - -#define RB_SET_BLACKRED(black, red, field) do { \ - RB_COLOR(black, field) = RB_BLACK; \ - RB_COLOR(red, field) = RB_RED; \ -} while (/*CONSTCOND*/ 0) - -#ifndef RB_AUGMENT -#define RB_AUGMENT(x) do {} while (/*CONSTCOND*/ 0) -#endif - -#define RB_ROTATE_LEFT(head, elm, tmp, field) do { \ - (tmp) = RB_RIGHT(elm, field); \ - if ((RB_RIGHT(elm, field) = RB_LEFT(tmp, field)) != NULL) { \ - RB_PARENT(RB_LEFT(tmp, field), field) = (elm); \ - } \ - RB_AUGMENT(elm); \ - if ((RB_PARENT(tmp, field) = RB_PARENT(elm, field)) != NULL) { \ - if ((elm) == RB_LEFT(RB_PARENT(elm, field), field)) \ - RB_LEFT(RB_PARENT(elm, field), field) = (tmp); \ - else \ - RB_RIGHT(RB_PARENT(elm, field), field) = (tmp); \ - } else \ - (head)->rbh_root = (tmp); \ - RB_LEFT(tmp, field) = (elm); \ - RB_PARENT(elm, field) = (tmp); \ - RB_AUGMENT(tmp); \ - if ((RB_PARENT(tmp, field))) \ - RB_AUGMENT(RB_PARENT(tmp, field)); \ -} while (/*CONSTCOND*/ 0) - -#define RB_ROTATE_RIGHT(head, elm, tmp, field) do { \ - (tmp) = RB_LEFT(elm, field); \ - if ((RB_LEFT(elm, field) = RB_RIGHT(tmp, field)) != NULL) { \ - RB_PARENT(RB_RIGHT(tmp, field), field) = (elm); \ - } \ - RB_AUGMENT(elm); \ - if ((RB_PARENT(tmp, field) = RB_PARENT(elm, field)) != NULL) { \ - if ((elm) == RB_LEFT(RB_PARENT(elm, field), field)) \ - RB_LEFT(RB_PARENT(elm, field), field) = (tmp); \ - else \ - RB_RIGHT(RB_PARENT(elm, field), field) = (tmp); \ - } else \ - (head)->rbh_root = (tmp); \ - RB_RIGHT(tmp, field) = (elm); \ - RB_PARENT(elm, field) = (tmp); \ - RB_AUGMENT(tmp); \ - if ((RB_PARENT(tmp, field))) \ - RB_AUGMENT(RB_PARENT(tmp, field)); \ -} while (/*CONSTCOND*/ 0) - -/* Generates prototypes and inline functions */ -#define RB_PROTOTYPE(name, type, field, cmp) \ - RB_PROTOTYPE_INTERNAL(name, type, field, cmp,) -#define RB_PROTOTYPE_STATIC(name, type, field, cmp) \ - RB_PROTOTYPE_INTERNAL(name, type, field, cmp, __unused static) -#define RB_PROTOTYPE_INTERNAL(name, type, field, cmp, attr) \ -attr void name##_RB_INSERT_COLOR(struct name *, struct type *); \ -attr void name##_RB_REMOVE_COLOR(struct name *, struct type *, struct type *);\ -attr struct type *name##_RB_REMOVE(struct name *, struct type *); \ -attr struct type *name##_RB_INSERT(struct name *, struct type *); \ -attr struct type *name##_RB_FIND(struct name *, struct type *); \ -attr struct type *name##_RB_NFIND(struct name *, struct type *); \ -attr struct type *name##_RB_NEXT(struct type *); \ -attr struct type *name##_RB_PREV(struct type *); \ -attr struct type *name##_RB_MINMAX(struct name *, int); \ - \ - -/* Main rb operation. - * Moves node close to the key of elm to top - */ -#define RB_GENERATE(name, type, field, cmp) \ - RB_GENERATE_INTERNAL(name, type, field, cmp,) -#define RB_GENERATE_STATIC(name, type, field, cmp) \ - RB_GENERATE_INTERNAL(name, type, field, cmp, __unused static) -#define RB_GENERATE_INTERNAL(name, type, field, cmp, attr) \ -attr void \ -name##_RB_INSERT_COLOR(struct name *head, struct type *elm) \ -{ \ - struct type *parent, *gparent, *tmp; \ - while ((parent = RB_PARENT(elm, field)) != NULL && \ - RB_COLOR(parent, field) == RB_RED) { \ - gparent = RB_PARENT(parent, field); \ - if (parent == RB_LEFT(gparent, field)) { \ - tmp = RB_RIGHT(gparent, field); \ - if (tmp && RB_COLOR(tmp, field) == RB_RED) { \ - RB_COLOR(tmp, field) = RB_BLACK; \ - RB_SET_BLACKRED(parent, gparent, field);\ - elm = gparent; \ - continue; \ - } \ - if (RB_RIGHT(parent, field) == elm) { \ - RB_ROTATE_LEFT(head, parent, tmp, field);\ - tmp = parent; \ - parent = elm; \ - elm = tmp; \ - } \ - RB_SET_BLACKRED(parent, gparent, field); \ - RB_ROTATE_RIGHT(head, gparent, tmp, field); \ - } else { \ - tmp = RB_LEFT(gparent, field); \ - if (tmp && RB_COLOR(tmp, field) == RB_RED) { \ - RB_COLOR(tmp, field) = RB_BLACK; \ - RB_SET_BLACKRED(parent, gparent, field);\ - elm = gparent; \ - continue; \ - } \ - if (RB_LEFT(parent, field) == elm) { \ - RB_ROTATE_RIGHT(head, parent, tmp, field);\ - tmp = parent; \ - parent = elm; \ - elm = tmp; \ - } \ - RB_SET_BLACKRED(parent, gparent, field); \ - RB_ROTATE_LEFT(head, gparent, tmp, field); \ - } \ - } \ - RB_COLOR(head->rbh_root, field) = RB_BLACK; \ -} \ - \ -attr void \ -name##_RB_REMOVE_COLOR(struct name *head, struct type *parent, struct type *elm) \ -{ \ - struct type *tmp; \ - while ((elm == NULL || RB_COLOR(elm, field) == RB_BLACK) && \ - elm != RB_ROOT(head)) { \ - if (RB_LEFT(parent, field) == elm) { \ - tmp = RB_RIGHT(parent, field); \ - if (RB_COLOR(tmp, field) == RB_RED) { \ - RB_SET_BLACKRED(tmp, parent, field); \ - RB_ROTATE_LEFT(head, parent, tmp, field);\ - tmp = RB_RIGHT(parent, field); \ - } \ - if ((RB_LEFT(tmp, field) == NULL || \ - RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) &&\ - (RB_RIGHT(tmp, field) == NULL || \ - RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK)) {\ - RB_COLOR(tmp, field) = RB_RED; \ - elm = parent; \ - parent = RB_PARENT(elm, field); \ - } else { \ - if (RB_RIGHT(tmp, field) == NULL || \ - RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK) {\ - struct type *oleft; \ - if ((oleft = RB_LEFT(tmp, field)) \ - != NULL) \ - RB_COLOR(oleft, field) = RB_BLACK;\ - RB_COLOR(tmp, field) = RB_RED; \ - RB_ROTATE_RIGHT(head, tmp, oleft, field);\ - tmp = RB_RIGHT(parent, field); \ - } \ - RB_COLOR(tmp, field) = RB_COLOR(parent, field);\ - RB_COLOR(parent, field) = RB_BLACK; \ - if (RB_RIGHT(tmp, field)) \ - RB_COLOR(RB_RIGHT(tmp, field), field) = RB_BLACK;\ - RB_ROTATE_LEFT(head, parent, tmp, field);\ - elm = RB_ROOT(head); \ - break; \ - } \ - } else { \ - tmp = RB_LEFT(parent, field); \ - if (RB_COLOR(tmp, field) == RB_RED) { \ - RB_SET_BLACKRED(tmp, parent, field); \ - RB_ROTATE_RIGHT(head, parent, tmp, field);\ - tmp = RB_LEFT(parent, field); \ - } \ - if ((RB_LEFT(tmp, field) == NULL || \ - RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) &&\ - (RB_RIGHT(tmp, field) == NULL || \ - RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK)) {\ - RB_COLOR(tmp, field) = RB_RED; \ - elm = parent; \ - parent = RB_PARENT(elm, field); \ - } else { \ - if (RB_LEFT(tmp, field) == NULL || \ - RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) {\ - struct type *oright; \ - if ((oright = RB_RIGHT(tmp, field)) \ - != NULL) \ - RB_COLOR(oright, field) = RB_BLACK;\ - RB_COLOR(tmp, field) = RB_RED; \ - RB_ROTATE_LEFT(head, tmp, oright, field);\ - tmp = RB_LEFT(parent, field); \ - } \ - RB_COLOR(tmp, field) = RB_COLOR(parent, field);\ - RB_COLOR(parent, field) = RB_BLACK; \ - if (RB_LEFT(tmp, field)) \ - RB_COLOR(RB_LEFT(tmp, field), field) = RB_BLACK;\ - RB_ROTATE_RIGHT(head, parent, tmp, field);\ - elm = RB_ROOT(head); \ - break; \ - } \ - } \ - } \ - if (elm) \ - RB_COLOR(elm, field) = RB_BLACK; \ -} \ - \ -attr struct type * \ -name##_RB_REMOVE(struct name *head, struct type *elm) \ -{ \ - struct type *child, *parent, *old = elm; \ - int color; \ - if (RB_LEFT(elm, field) == NULL) \ - child = RB_RIGHT(elm, field); \ - else if (RB_RIGHT(elm, field) == NULL) \ - child = RB_LEFT(elm, field); \ - else { \ - struct type *left; \ - elm = RB_RIGHT(elm, field); \ - while ((left = RB_LEFT(elm, field)) != NULL) \ - elm = left; \ - child = RB_RIGHT(elm, field); \ - parent = RB_PARENT(elm, field); \ - color = RB_COLOR(elm, field); \ - if (child) \ - RB_PARENT(child, field) = parent; \ - if (parent) { \ - if (RB_LEFT(parent, field) == elm) \ - RB_LEFT(parent, field) = child; \ - else \ - RB_RIGHT(parent, field) = child; \ - RB_AUGMENT(parent); \ - } else \ - RB_ROOT(head) = child; \ - if (RB_PARENT(elm, field) == old) \ - parent = elm; \ - (elm)->field = (old)->field; \ - if (RB_PARENT(old, field)) { \ - if (RB_LEFT(RB_PARENT(old, field), field) == old)\ - RB_LEFT(RB_PARENT(old, field), field) = elm;\ - else \ - RB_RIGHT(RB_PARENT(old, field), field) = elm;\ - RB_AUGMENT(RB_PARENT(old, field)); \ - } else \ - RB_ROOT(head) = elm; \ - RB_PARENT(RB_LEFT(old, field), field) = elm; \ - if (RB_RIGHT(old, field)) \ - RB_PARENT(RB_RIGHT(old, field), field) = elm; \ - if (parent) { \ - left = parent; \ - do { \ - RB_AUGMENT(left); \ - } while ((left = RB_PARENT(left, field)) != NULL); \ - } \ - goto color; \ - } \ - parent = RB_PARENT(elm, field); \ - color = RB_COLOR(elm, field); \ - if (child) \ - RB_PARENT(child, field) = parent; \ - if (parent) { \ - if (RB_LEFT(parent, field) == elm) \ - RB_LEFT(parent, field) = child; \ - else \ - RB_RIGHT(parent, field) = child; \ - RB_AUGMENT(parent); \ - } else \ - RB_ROOT(head) = child; \ -color: \ - if (color == RB_BLACK) \ - name##_RB_REMOVE_COLOR(head, parent, child); \ - return (old); \ -} \ - \ -/* Inserts a node into the RB tree */ \ -attr struct type * \ -name##_RB_INSERT(struct name *head, struct type *elm) \ -{ \ - struct type *tmp; \ - struct type *parent = NULL; \ - int comp = 0; \ - tmp = RB_ROOT(head); \ - while (tmp) { \ - parent = tmp; \ - comp = (cmp)(elm, parent); \ - if (comp < 0) \ - tmp = RB_LEFT(tmp, field); \ - else if (comp > 0) \ - tmp = RB_RIGHT(tmp, field); \ - else \ - return (tmp); \ - } \ - RB_SET(elm, parent, field); \ - if (parent != NULL) { \ - if (comp < 0) \ - RB_LEFT(parent, field) = elm; \ - else \ - RB_RIGHT(parent, field) = elm; \ - RB_AUGMENT(parent); \ - } else \ - RB_ROOT(head) = elm; \ - name##_RB_INSERT_COLOR(head, elm); \ - return (NULL); \ -} \ - \ -/* Finds the node with the same key as elm */ \ -attr struct type * \ -name##_RB_FIND(struct name *head, struct type *elm) \ -{ \ - struct type *tmp = RB_ROOT(head); \ - int comp; \ - while (tmp) { \ - comp = cmp(elm, tmp); \ - if (comp < 0) \ - tmp = RB_LEFT(tmp, field); \ - else if (comp > 0) \ - tmp = RB_RIGHT(tmp, field); \ - else \ - return (tmp); \ - } \ - return (NULL); \ -} \ - \ -/* Finds the first node greater than or equal to the search key */ \ -attr struct type * \ -name##_RB_NFIND(struct name *head, struct type *elm) \ -{ \ - struct type *tmp = RB_ROOT(head); \ - struct type *res = NULL; \ - int comp; \ - while (tmp) { \ - comp = cmp(elm, tmp); \ - if (comp < 0) { \ - res = tmp; \ - tmp = RB_LEFT(tmp, field); \ - } \ - else if (comp > 0) \ - tmp = RB_RIGHT(tmp, field); \ - else \ - return (tmp); \ - } \ - return (res); \ -} \ - \ -/* ARGSUSED */ \ -attr struct type * \ -name##_RB_NEXT(struct type *elm) \ -{ \ - if (RB_RIGHT(elm, field)) { \ - elm = RB_RIGHT(elm, field); \ - while (RB_LEFT(elm, field)) \ - elm = RB_LEFT(elm, field); \ - } else { \ - if (RB_PARENT(elm, field) && \ - (elm == RB_LEFT(RB_PARENT(elm, field), field))) \ - elm = RB_PARENT(elm, field); \ - else { \ - while (RB_PARENT(elm, field) && \ - (elm == RB_RIGHT(RB_PARENT(elm, field), field)))\ - elm = RB_PARENT(elm, field); \ - elm = RB_PARENT(elm, field); \ - } \ - } \ - return (elm); \ -} \ - \ -/* ARGSUSED */ \ -attr struct type * \ -name##_RB_PREV(struct type *elm) \ -{ \ - if (RB_LEFT(elm, field)) { \ - elm = RB_LEFT(elm, field); \ - while (RB_RIGHT(elm, field)) \ - elm = RB_RIGHT(elm, field); \ - } else { \ - if (RB_PARENT(elm, field) && \ - (elm == RB_RIGHT(RB_PARENT(elm, field), field))) \ - elm = RB_PARENT(elm, field); \ - else { \ - while (RB_PARENT(elm, field) && \ - (elm == RB_LEFT(RB_PARENT(elm, field), field)))\ - elm = RB_PARENT(elm, field); \ - elm = RB_PARENT(elm, field); \ - } \ - } \ - return (elm); \ -} \ - \ -attr struct type * \ -name##_RB_MINMAX(struct name *head, int val) \ -{ \ - struct type *tmp = RB_ROOT(head); \ - struct type *parent = NULL; \ - while (tmp) { \ - parent = tmp; \ - if (val < 0) \ - tmp = RB_LEFT(tmp, field); \ - else \ - tmp = RB_RIGHT(tmp, field); \ - } \ - return (parent); \ -} - -#define RB_NEGINF -1 -#define RB_INF 1 - -#define RB_INSERT(name, x, y) name##_RB_INSERT(x, y) -#define RB_REMOVE(name, x, y) name##_RB_REMOVE(x, y) -#define RB_FIND(name, x, y) name##_RB_FIND(x, y) -#define RB_NFIND(name, x, y) name##_RB_NFIND(x, y) -#define RB_NEXT(name, x, y) name##_RB_NEXT(y) -#define RB_PREV(name, x, y) name##_RB_PREV(y) -#define RB_MIN(name, x) name##_RB_MINMAX(x, RB_NEGINF) -#define RB_MAX(name, x) name##_RB_MINMAX(x, RB_INF) - -#define RB_FOREACH(x, name, head) \ - for ((x) = RB_MIN(name, head); \ - (x) != NULL; \ - (x) = name##_RB_NEXT(x)) - -#define RB_FOREACH_FROM(x, name, y) \ - for ((x) = (y); \ - ((x) != NULL) && ((y) = name##_RB_NEXT(x), (x) != NULL); \ - (x) = (y)) - -#define RB_FOREACH_SAFE(x, name, head, y) \ - for ((x) = RB_MIN(name, head); \ - ((x) != NULL) && ((y) = name##_RB_NEXT(x), (x) != NULL); \ - (x) = (y)) - -#define RB_FOREACH_REVERSE(x, name, head) \ - for ((x) = RB_MAX(name, head); \ - (x) != NULL; \ - (x) = name##_RB_PREV(x)) - -#define RB_FOREACH_REVERSE_FROM(x, name, y) \ - for ((x) = (y); \ - ((x) != NULL) && ((y) = name##_RB_PREV(x), (x) != NULL); \ - (x) = (y)) - -#define RB_FOREACH_REVERSE_SAFE(x, name, head, y) \ - for ((x) = RB_MAX(name, head); \ - ((x) != NULL) && ((y) = name##_RB_PREV(x), (x) != NULL); \ - (x) = (y)) - -#endif /* _SYS_TREE_H_ */ diff --git a/testing/bsd-compat-headers/sources b/testing/bsd-compat-headers/sources deleted file mode 100644 index 0b640f69..00000000 --- a/testing/bsd-compat-headers/sources +++ /dev/null @@ -1,3 +0,0 @@ -files/cdefs.h -files/queue.h -files/tree.h diff --git a/testing/bsd-compat-headers/version b/testing/bsd-compat-headers/version deleted file mode 100644 index 1078b9e9..00000000 --- a/testing/bsd-compat-headers/version +++ /dev/null @@ -1 +0,0 @@ -0.7.1 1 diff --git a/testing/chromium/build b/testing/chromium/build deleted file mode 100755 index 47750fbc..00000000 --- a/testing/chromium/build +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh -e - -pkg_dir=$1 - -set -- \ - blink_symbol_level=0 \ - clang_use_chrome_plugins=false \ - closure_compile=false \ - custom_toolchain=\"//build/toolchain/linux/unbundle:default\" \ - enable_ipc_logging=false \ - enable_iterator_debugging=false \ - enable_nacl=false \ - enable_nacl_nonsfi=false \ - enable_native_notifications=false \ - enable_service_discovery=false \ - enable_swiftshader=false \ - fatal_linker_warnings=false \ - fieldtrial_testing_like_official_build=true \ - host_toolchain=\"//build/toolchain/linux/unbundle:default\" \ - icu_use_data_file=true \ - is_clang=true \ - is_component_build=false \ - is_debug=false \ - linux_use_bundled_binutils=false \ - proprietary_codecs=false \ - safe_browsing_mode=0 \ - symbol_level=0 \ - treat_warnings_as_errors=false \ - use_allocator=\"none\" \ - use_allocator_shim=false \ - use_atk=false \ - use_cups=false \ - use_custom_libcxx=false \ - use_dbus=false \ - use_gnome_keyring=false \ - use_official_google_api_keys=false \ - use_pulseaudio=false \ - use_sysroot=false \ - use_system_harfbuzz=true \ - rtc_use_pipewire = false - -for patch in *.patch; do - patch -p1 < "$patch" -done - -# Use 'clang' instead of 'gcc'. -# Clang is the officially supported compiler and builds chromium faster. -export CC=clang CXX=clang++ AR=llvm-ar NM=llvm-nm LD=clang++ -export PATH=$PWD/fix-python-bin:$PATH - -# Make a temporary script to cause 'python' to resolve to python 2 and not 3. -mkdir -p fix-python-bin -cat << EOF > ./fix-python-bin/python -#!/bin/sh -exec python2 "\$@" -EOF -chmod +x ./fix-python-bin/python - -# Use system nodejs. -mkdir -p third_party/node/linux/node-linux-x64/bin -ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/ - -# Use system libraries. -for dep in fontconfig harfbuzz-ng libdrm libevent libjpeg \ - libpng libwebp libxml libxslt opus re2 snappy yasm; do - find . -type f -path "*third_party/$dep/*" \ - \! -path "*third_party/$dep/chromium/*" \ - \! -path "*third_party/$dep/google/*" \ - \! -path './base/third_party/icu/*' \ - \! -path './third_party/pdfium/third_party/freetype/include/pstables.h' \ - \! -path './third_party/yasm/run_yasm.py' \ - \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \ - -delete -done - -# Switch to system provided dependencies. -python2 build/linux/unbundle/replace_gn_files.py \ - --system-libraries fontconfig harfbuzz-ng libdrm libevent \ - libjpeg libpng libwebp libxml libxslt opus re2 \ - snappy yasm - -python2 tools/gn/bootstrap/bootstrap.py -s -v --gn-gen-args "$*" - -# All shells seem to support this despite the lack of a POSIX spec for it. -# shellcheck disable=2039 -ulimit -n 4096 ||: - -out/Release/gn gen out/Release \ - --script-executable=/usr/bin/python2 - -ninja -C out/Release chrome chromedriver - -cd out/Release - -for bin in chrome chromedriver *.bin; do - install -Dm755 "$bin" "$pkg_dir/usr/lib/chromium/$bin" -done - -mkdir -p "$pkg_dir/usr/bin" -ln -s /usr/lib/chromium/chrome "$pkg_dir/usr/bin/chrome" -ln -s /usr/lib/chromium/chromedriver "$pkg_dir/usr/bin/chromedriver" diff --git a/testing/chromium/checksums b/testing/chromium/checksums deleted file mode 100644 index fd417be9..00000000 --- a/testing/chromium/checksums +++ /dev/null @@ -1,74 +0,0 @@ -510e6ca7ccc218b401b375c13656f6aecab196b03142026dc3602b9d1804a5ac chromium-75.0.3770.142.tar.xz -8f53e2516ae830db656cbeb13bab3ace3df6c15494ac3df94a4b5c0f78dadf31 0000-build.patch -6cb02c710eee5c2a0b67b8ff48ee1328f9db3d1f430cb4c213887f1860720f32 0001-fix-building-without-safebrowsing.patch -25d80d8cdb4143e0d96fe2b748340bcdf21055b1c7cbd5529fc630eea48875b0 0001-simd.patch -62293ec9232bf68362c33135739623dc432c04e54842425b7b1a5d5646975e95 0002-uninitializedcheck.patch -bc2a44c2f3574f5997e54e4088e1644bcffaa6f541cd729a32bf94ea05dd10bb 0003-disable-autofill-download-manager.patch -4a27dea88e61e1ba607cc9868ecba60882759ea608299c42ce59b821f0e17d8a 0004-disable-google-url-tracker.patch -1dc7e3f22cd81ca85ea9f3240cc6adb90f111477c9cc05efcfe4943a2dcf9f6e 0005-disable-default-extensions.patch -a15de5b30ad7d77358116faf1e40a82dec2f43da25f51a44e8e265b161ab8da0 0006-modify-default-prefs.patch -22cc3b5e1032a170c958213f546a1dc48fd9433823767b0159d40f930a0b3029 0007-disable-web-resource-service.patch -a7728ea22805f69ce9a16a35ae067fe570825e8154bdb66b18bb072289c5589e 0008-restore-classic-ntp.patch -e7d182028feb9d6790e7a849671c4c79a833909fdb2c48f3b11272ea53c127cc 0009-disable-google-ipv6-probes.patch -3f40d4f1a0f7a03945c80e6ffd417ca93e4f7f22ee09faaa71a058e6e246786f 0010-disable-gcm-status-check.patch -52dc08f76953323413eefded936b7fa3e3bc69ba75e2a74b80455d3da5e708a8 0014-disable-translation-lang-fetch.patch -b5e0f354ebf44075899d3161f808e2e070194377c7f801935e49200ca4bae9c0 0015-disable-update-pings.patch -ed7c8ebaa0ee44d4775c0bfb097a22340e30d2d78546f223fbc8e8da4e457686 0019-disable-battery-status-service.patch -80e6512b928082a0b59465e1dcbab5e6284b545933f42d262194b1a86811a243 0021-disable-rlz.patch -45e970e285ceb599c15aa7184f6f86061abd4de6c58a985678bfb6cc68464c77 android.patch -ece2d462169429541a7fa1cc7f3f72698e883292500dde6f1c64ce165dd6abd9 chromium-75-fix-gn-gen.patch -b386cb54d0229c640cc44012a9dbb0b822c979810a62be92dc44e1a3c8a457d3 chromium-75-gcc-angle-fix.patch -1830b37534e2adf7fd22569c1bbe10eb29bcf85bd9437dc5039c91e7097dc627 chromium-75-llvm8.patch -3376f7868124a45a8ee325b1fbd607aabdfd86adba6b77d49b1399dcddc70605 chromium-75-lss.patch -a53cf274de7b13ab06fb7867b45b4bfdb1229c5686f3874b2854e3172824ce19 chromium-75-noexcept.patch -788ad2094f5c6991c3c4514000d153a1ecb3a23767594092748b6e85a367ddbd chromium-75-pure-virtual.patch -762f707ebd9397e7be2ba47bc106911dc2535ff82f37dbbeeded683b66bffa32 chromium-75-unique_ptr.patch -365e1a76dc3e508846a221d4490d134ed7fa3d36a3a28ce0b03f5d66c1503778 chromium-compiler-r9.patch -daa26bab3a3a9f8b8539dffefa7a07f6d7ac07476d7ae762e3f0169985e429ff chromium-fix-char_traits.patch -75c31df557238c5bdc2b91401b13b381b68c812594d89f8f053e0e489d4991c2 chromium-optional-atk-r1.patch -6592a17ac557d4cdd5dbb9cd2445c95c1668f17d8c95a7f5ebf42ebbde35430e chromium-optional-dbus-r5.patch -f0e59aee57bffc87ab8d51f1f893ec8ed561769328352a9124f717e886b8054f chromium-url-formatter.patch -8c6ecc26aab9f4acc911350d9bb1e40f32cad144b6a08c9d7b188e9598d0f2de chromium-widevine-r4.patch -85f819beee54b6a87d63d59dd0094885dccf0b7cbed7efe6b90b9f6b5cbb78e9 device-notifications.patch -2907556a180098f02e945ee4f8dce1f0ff6f84362328700a4a23fb195b324266 disable-crash-reporter.patch -13ee937555d20af557a18029a7cfde0f387c542f2bfe75bdb9b9b85187cec9ee disable-domain-reliability.patch -a1422d23da46e2dc39974dbe25787e5040e0dd1104806a796d5776af80cf0bb4 disable-download-quarantine.patch -cba503f5d3d776c951c5ee20eaa0a17d48fb5981823dd8118f9d48e61b42d411 disable-fetching-field-trials.patch -3ab3ef00886f89da2802b16ad8cebde881b26dbcbb0f1b1b6563dcede0a627d3 disable-fonts-googleapis-references.patch -39ea6f6e39f91249f5a89324f083863b934171eeb67667e26a2863e91af2b578 disable-gaia.patch -64d6c33f565c6fc1702fcc97af56ecbc3564fa8b5591d73f554ec48d97fc73fd disable-gcm.patch -ef924778ebfc2462b8b12f49e32dff00adc2883af344c3895e5026b11d36c4f1 disable-google-host-detection.patch -ce6a00f2c31dfc6b06154ca9db9ccda5b42bc9965f861d9978bc202ee2549c01 disable-mei-preload.patch -599ba1f2bb26b6afd81fc207181dfd95368ad10992b40a6752999fe12f7ea837 disable-network-time-tracker.patch -a4d5cc75a9979d13a368d22c8281c80a2c025629b6145ee0aacafef56da4c5d9 disable-webrtc-log-uploader.patch -9058162657672162964d2f35431c208d1cfae12325858ff636044d667e9dcaf5 disable_swiftshader.patch -d0059ab268e3d2030f9e2d2b36b16f3e68bdb3353a98b07f974d3c353fa7238f fix-building-without-mdns-and-service-discovery.patch -5b698ada72c4afe56271d6397c49367ec8614c664fd294cc7d43705eb4306ac6 fix-building-without-safebrowsing.patch -760a9fd65492138fa9ccf57aa5579f8f66d0e593582ac930dcc0cbe54076b166 fuzzers.patch -9248bae6df77f701afc9ecd36a6e2901649a4a5edf106475e4f26f623cd31892 google-api-warning.patch -6d921355eaef7101a0713e0e7a88b7a7c4e8aa28391325399fdd0a59f2358d13 musl-cdefs-r2.patch -fec5590225bf3d0238ee45f8f67fcb032946abe351383653c3026ce4e706d48f musl-dlopen.patch -f1375a3acd205ee46dd5d7c729e09d19982833f71e5eb1fb9c3ec5d3de5ffe90 musl-dns-r2.patch -f1f414b16acc1986eca620c264fffc1a73e6468e4d8ae076b8ab7c2266c66c58 musl-execinfo-r8.patch -49537286728fe29d2e9d3e9040480576aa13be862fb68596fb9629462aab30c1 musl-fpstate-r1.patch -f2f8d67f26dc69e050950b522410cab6ab8ee4170ad810f15ed75ce30fe0ae8d musl-headers-r1.patch -a7bffd948d4f55c7d57985f85b6fbbbbea3a6638be223b6b7863008dd1b72006 musl-libcpp.patch -50505f127d17e25c298848b8a02664fd03083ebbd33e3318f818cd4657a51fee musl-mallinfo-r7.patch -2fbc6fba166788e5f6d8a4846fcffc00f703f47b37f16a5e832132e01cc8c565 musl-pthread-r5.patch -375df387335a82bea9362f819a93575877de94eae96528347726e6b5d9c4a4cd musl-ptrace.patch -c8dac5abf0cd34f1eee71c6c1bce619ec213d9d2f9511654ccc947a2ad0e6850 musl-realpath.patch -ebde3be74f0db9486cf99cd7faafb29f1472f432046b8801c494cff5713c8d94 musl-sandbox-r3.patch -8b183ce939a5ec37dee6af3e473ce71bd86c9cf1e647a667b4a3f760b56404de musl-secure_getenv-r1.patch -3ff4f1eb041048efe9ff8ce5d91fcb092d2fc06e373459ca2d9d590ee176dfb9 musl-siginfo.patch -675c056977f396ec135c50b25601cf10b545c357e5a21baf7e0e4fe71e3ecdf1 musl-socket.patch -5813a3031e97178a3e36fe48b24f3ddec934f43505819b66dcea5c0dd340644c musl-stacksize-r3.patch -4e96a1204c6cc0d9ab38a7232121709b48ed1704391c30ed3ba7b22bc0881b92 musl-stacktrace-r2.patch -1f10590d5322968667874c4aa5a4314e9dc5f659091de67f032ebe9654cd5482 musl-syscall.patch -a4b0374c536128483cdaeb706f2b1a7144168ae6e44d9ca2df7445d1be780afc musl-ucontext-r1.patch -72d806af57a729d36b1eb482419245fba4c58d035fc20e58dbbcf88c35d50e97 musl-v8-monotonic-pthread-cont_timedwait.patch -e191334207865e43b831492913d58cae4c89449d32b362b9f9aa7e1d196837a9 musl-wordsize-r1.patch -b07a4903f150da643320012880622b6d52c0ccf1e85d3425240188277ee546ef perfetto.patch -77ece26615320e5ffbda4ba2dcfc3a184cba923a1be19fc031fa5edb56e59632 safe_browsing-disable-incident-reporting.patch -5f8d6876420bd9a5c208d432a82a4faa78f43d24fe5b425a8f6a0a475bc4e8dd safe_browsing-disable-reporting-of-safebrowsing-over.patch -3f55f3ed81f4d967b8eb45655ddbdd3a59da3d69dbf1999a9335b199c84d1c9d unrar.patch -815a2a41003747bb6b44df192af4650e9ea0fe2dc87bb689a9bbb6e7a2c3eddd welcome-page.patch diff --git a/testing/chromium/depends b/testing/chromium/depends deleted file mode 100644 index 7415e0c9..00000000 --- a/testing/chromium/depends +++ /dev/null @@ -1,40 +0,0 @@ -alsa-lib make -bison make -bsd-compat-headers make -clang make -lld make -ffmpeg make -fontconfig make -freetype make -git make -glib make -gperf make -gtk+3 make -gzip make -json-c make -jsoncpp make -libXScrnSaver make -libXcomposite make -libXcursor make -libXdamage make -libXi make -libXrandr make -libXtst make -libcap make -libevent make -libjpeg-turbo make -libwebp make -libxml2 make -libxslt make -minizip make -ninja make -nodejs make -nss make -pango make -pciutils make -perl make -python2 make -re2 make -snappy make -yasm make -zlib make diff --git a/testing/chromium/patches/0000-build.patch b/testing/chromium/patches/0000-build.patch deleted file mode 100644 index c22a3016..00000000 --- a/testing/chromium/patches/0000-build.patch +++ /dev/null @@ -1 +0,0 @@ -ZGlmZiAtLWdpdCBhL2NvbnRyaWIvbWluaXppcC9pb2FwaS5oIGIvY29udHJpYi9taW5pemlwL2lvYXBpLmgKaW5kZXggOGRjYmRiMDZlMzVhLi5jMWI3YTU0ODQ3ZjUgMTAwNjQ0Ci0tLSBhL2NvbnRyaWIvbWluaXppcC9pb2FwaS5oCisrKyBiL2NvbnRyaWIvbWluaXppcC9pb2FwaS5oCkBAIC00Myw3ICs0Myw3IEBACiAKICNpbmNsdWRlIDxzdGRpby5oPgogI2luY2x1ZGUgPHN0ZGxpYi5oPgotI2luY2x1ZGUgInpsaWIuaCIKKyNpbmNsdWRlICJ0aGlyZF9wYXJ0eS96bGliL3psaWIuaCIKIAogI2lmIGRlZmluZWQoVVNFX0ZJTEUzMkFQSSkKICNkZWZpbmUgZm9wZW42NCBmb3BlbgpkaWZmIC0tZ2l0IGEvY29udHJpYi9taW5pemlwL2lvd2luMzIuYyBiL2NvbnRyaWIvbWluaXppcC9pb3dpbjMyLmMKaW5kZXggMjc0ZjM5ZWIxZGQyLi4yNDZjZWI5MWExMzkgMTAwNjQ0Ci0tLSBhL2NvbnRyaWIvbWluaXppcC9pb3dpbjMyLmMKKysrIGIvY29udHJpYi9taW5pemlwL2lvd2luMzIuYwpAQCAtMjYsMTIgKzI2LDE5IEBACiAjZW5kaWYKIAogCisjaWZkZWYgX1dJTjMyX1dJTk5UCisjdW5kZWYgX1dJTjMyX1dJTk5UCisjZGVmaW5lIF9XSU4zMl9XSU5OVCAweDYwMQorI2VuZGlmCisKKyNpZiBfV0lOMzJfV0lOTlQgPj0gX1dJTjMyX1dJTk5UX1dJTjgKIC8vIHNlZSBJbmNsdWRlL3NoYXJlZC93aW5hcGlmYW1pbHkuaCBpbiB0aGUgV2luZG93cyBLaXQKICNpZiBkZWZpbmVkKFdJTkFQSV9GQU1JTFlfUEFSVElUSU9OKSAmJiAoIShkZWZpbmVkKElPV0lOMzJfVVNJTkdfV0lOUlRfQVBJKSkpCiAjaWYgV0lOQVBJX0ZBTUlMWV9PTkVfUEFSVElUSU9OKFdJTkFQSV9GQU1JTFksIFdJTkFQSV9QQVJUSVRJT05fQVBQKQogI2RlZmluZSBJT1dJTjMyX1VTSU5HX1dJTlJUX0FQSSAxCiAjZW5kaWYKICNlbmRpZgorI2VuZGlmCiAKIHZvaWRwZiAgWkNBTExCQUNLIHdpbjMyX29wZW5fZmlsZV9mdW5jICBPRigodm9pZHBmIG9wYXF1ZSwgY29uc3QgY2hhciogZmlsZW5hbWUsIGludCBtb2RlKSk7CiB1TG9uZyAgIFpDQUxMQkFDSyB3aW4zMl9yZWFkX2ZpbGVfZnVuYyAgT0YoKHZvaWRwZiBvcGFxdWUsIHZvaWRwZiBzdHJlYW0sIHZvaWQqIGJ1ZiwgdUxvbmcgc2l6ZSkpOwpkaWZmIC0tZ2l0IGEvY29udHJpYi9taW5pemlwL216dG9vbHMuYyBiL2NvbnRyaWIvbWluaXppcC9tenRvb2xzLmMKaW5kZXggOTY4OTFjMmUwYjcxLi44YmY5Y2NhMzI2MzMgMTAwNjQ0Ci0tLSBhL2NvbnRyaWIvbWluaXppcC9tenRvb2xzLmMKKysrIGIvY29udHJpYi9taW5pemlwL216dG9vbHMuYwpAQCAtOCw3ICs4LDcgQEAKICNpbmNsdWRlIDxzdGRpby5oPgogI2luY2x1ZGUgPHN0ZGxpYi5oPgogI2luY2x1ZGUgPHN0cmluZy5oPgotI2luY2x1ZGUgInpsaWIuaCIKKyNpbmNsdWRlICJ0aGlyZF9wYXJ0eS96bGliL3psaWIuaCIKICNpbmNsdWRlICJ1bnppcC5oIgogCiAjZGVmaW5lIFJFQURfOChhZHIpICAoKHVuc2lnbmVkIGNoYXIpKihhZHIpKQpkaWZmIC0tZ2l0IGEvY29udHJpYi9taW5pemlwL216dG9vbHMuaCBiL2NvbnRyaWIvbWluaXppcC9tenRvb2xzLmgKaW5kZXggYTQ5YTQyNmVjMmZjLi5mMjk1ZmZlZGE2YWYgMTAwNjQ0Ci0tLSBhL2NvbnRyaWIvbWluaXppcC9tenRvb2xzLmgKKysrIGIvY29udHJpYi9taW5pemlwL216dG9vbHMuaApAQCAtMTIsNyArMTIsNyBAQCBleHRlcm4gIkMiIHsKICNlbmRpZgogCiAjaWZuZGVmIF9aTElCX0gKLSNpbmNsdWRlICJ6bGliLmgiCisjaW5jbHVkZSAidGhpcmRfcGFydHkvemxpYi96bGliLmgiCiAjZW5kaWYKIAogI2luY2x1ZGUgInVuemlwLmgiCmRpZmYgLS1naXQgYS9jb250cmliL21pbml6aXAvdW56aXAuYyBiL2NvbnRyaWIvbWluaXppcC91bnppcC5jCmluZGV4IGJjZmI5NDE2ZWMzNS4uMTk5YjQ3MjNmY2ZjIDEwMDY0NAotLS0gYS9jb250cmliL21pbml6aXAvdW56aXAuYworKysgYi9jb250cmliL21pbml6aXAvdW56aXAuYwpAQCAtNzIsNyArNzIsNyBAQAogICAgICAgICAjZGVmaW5lIE5PVU5DUllQVAogI2VuZGlmCiAKLSNpbmNsdWRlICJ6bGliLmgiCisjaW5jbHVkZSAidGhpcmRfcGFydHkvemxpYi96bGliLmgiCiAjaW5jbHVkZSAidW56aXAuaCIKIAogI2lmZGVmIFNUREMKQEAgLTE3MDUsMTEgKzE3MDUsNiBAQCBleHRlcm4gaW50IFpFWFBPUlQgdW56UmVhZEN1cnJlbnRGaWxlICAodW56RmlsZSBmaWxlLCB2b2lkcCBidWYsIHVuc2lnbmVkIGxlbikKIAogICAgIHBmaWxlX2luX3ppcF9yZWFkX2luZm8tPnN0cmVhbS5hdmFpbF9vdXQgPSAodUludClsZW47CiAKLSAgICBpZiAoKGxlbj5wZmlsZV9pbl96aXBfcmVhZF9pbmZvLT5yZXN0X3JlYWRfdW5jb21wcmVzc2VkKSAmJgotICAgICAgICAoIShwZmlsZV9pbl96aXBfcmVhZF9pbmZvLT5yYXcpKSkKLSAgICAgICAgcGZpbGVfaW5femlwX3JlYWRfaW5mby0+c3RyZWFtLmF2YWlsX291dCA9Ci0gICAgICAgICAgICAodUludClwZmlsZV9pbl96aXBfcmVhZF9pbmZvLT5yZXN0X3JlYWRfdW5jb21wcmVzc2VkOwotCiAgICAgaWYgKChsZW4+cGZpbGVfaW5femlwX3JlYWRfaW5mby0+cmVzdF9yZWFkX2NvbXByZXNzZWQrCiAgICAgICAgICAgIHBmaWxlX2luX3ppcF9yZWFkX2luZm8tPnN0cmVhbS5hdmFpbF9pbikgJiYKICAgICAgICAgIChwZmlsZV9pbl96aXBfcmVhZF9pbmZvLT5yYXcpKQpkaWZmIC0tZ2l0IGEvY29udHJpYi9taW5pemlwL3VuemlwLmggYi9jb250cmliL21pbml6aXAvdW56aXAuaAppbmRleCAyMTA0ZTM5MTUwNzQuLjNjMDE0MzUyOWI5MSAxMDA2NDQKLS0tIGEvY29udHJpYi9taW5pemlwL3VuemlwLmgKKysrIGIvY29udHJpYi9taW5pemlwL3VuemlwLmgKQEAgLTQ4LDcgKzQ4LDcgQEAgZXh0ZXJuICJDIiB7CiAjZW5kaWYKIAogI2lmbmRlZiBfWkxJQl9ICi0jaW5jbHVkZSAiemxpYi5oIgorI2luY2x1ZGUgInRoaXJkX3BhcnR5L3psaWIvemxpYi5oIgogI2VuZGlmCiAKICNpZm5kZWYgIF9aTElCSU9BUElfSApkaWZmIC0tZ2l0IGEvY29udHJpYi9taW5pemlwL3ppcC5jIGIvY29udHJpYi9taW5pemlwL3ppcC5jCmluZGV4IDQ0ZTg4YTljYjk4OS4uNjVjMGM3MjUxODQzIDEwMDY0NAotLS0gYS9jb250cmliL21pbml6aXAvemlwLmMKKysrIGIvY29udHJpYi9taW5pemlwL3ppcC5jCkBAIC0yNiw3ICsyNiw3IEBACiAjaW5jbHVkZSA8c3RkbGliLmg+CiAjaW5jbHVkZSA8c3RyaW5nLmg+CiAjaW5jbHVkZSA8dGltZS5oPgotI2luY2x1ZGUgInpsaWIuaCIKKyNpbmNsdWRlICJ0aGlyZF9wYXJ0eS96bGliL3psaWIuaCIKICNpbmNsdWRlICJ6aXAuaCIKIAogI2lmZGVmIFNUREMKZGlmZiAtLWdpdCBhL2NvbnRyaWIvbWluaXppcC96aXAuaCBiL2NvbnRyaWIvbWluaXppcC96aXAuaAppbmRleCA4YWFlYmI2MjM0MzAuLjhjMDZjMGFhN2JiMCAxMDA2NDQKLS0tIGEvY29udHJpYi9taW5pemlwL3ppcC5oCisrKyBiL2NvbnRyaWIvbWluaXppcC96aXAuaApAQCAtNDcsNyArNDcsNyBAQCBleHRlcm4gIkMiIHsKIC8vI2RlZmluZSBIQVZFX0JaSVAyCiAKICNpZm5kZWYgX1pMSUJfSAotI2luY2x1ZGUgInpsaWIuaCIKKyNpbmNsdWRlICJ0aGlyZF9wYXJ0eS96bGliL3psaWIuaCIKICNlbmRpZgogCiAjaWZuZGVmIF9aTElCSU9BUElfSApkaWZmIC0tZ2l0IGEvZ3pyZWFkLmMgYi9nenJlYWQuYwppbmRleCA5NTZiOTFlYTdkOWUuLjgzMmQzZWY5OGM1OSAxMDA2NDQKLS0tIGEvZ3pyZWFkLmMKKysrIGIvZ3pyZWFkLmMKQEAgLTQ0Myw3ICs0NDMsMTEgQEAgel9zaXplX3QgWkVYUE9SVCBnemZyZWFkKGJ1Ziwgc2l6ZSwgbml0ZW1zLCBmaWxlKQogIyAgdW5kZWYgel9nemdldGMKICNlbHNlCiAjICB1bmRlZiBnemdldGMKKyMgIGlmZGVmIFpfQ1JfUFJFRklYX1NFVAorIyAgICBkZWZpbmUgZ3pnZXRjIENyX3pfZ3pnZXRjCisjICBlbmRpZgogI2VuZGlmCisKIGludCBaRVhQT1JUIGd6Z2V0YyhmaWxlKQogICAgIGd6RmlsZSBmaWxlOwogewpkaWZmIC0tZ2l0IGEvemNvbmYuaCBiL3pjb25mLmgKaW5kZXggNWUxZDY4YTAwNGU5Li5hN2E4MTVmNTc1YTcgMTAwNjQ0Ci0tLSBhL3pjb25mLmgKKysrIGIvemNvbmYuaApAQCAtOCw2ICs4LDEwIEBACiAjaWZuZGVmIFpDT05GX0gKICNkZWZpbmUgWkNPTkZfSAogCisvKiBUaGlzIGluY2x1ZGUgZG9lcyBwcmVmaXhpbmcgYXMgYmVsb3csIGJ1dCB3aXRoIGFuIHVwZGF0ZWQgc2V0IG9mIG5hbWVzLiAgQWxzbworICogc2V0cyB1cCBleHBvcnQgbWFjcm9zIGluIGNvbXBvbmVudCBidWlsZHMuICovCisjaW5jbHVkZSAiY2hyb21lY29uZi5oIgorCiAvKgogICogSWYgeW91ICpyZWFsbHkqIG5lZWQgYSB1bmlxdWUgcHJlZml4IGZvciBhbGwgdHlwZXMgYW5kIGxpYnJhcnkgZnVuY3Rpb25zLAogICogY29tcGlsZSB3aXRoIC1EWl9QUkVGSVguIFRoZSAic3RhbmRhcmQiIHpsaWIgc2hvdWxkIGJlIGNvbXBpbGVkIHdpdGhvdXQgaXQuCkBAIC00MzEsNyArNDM0LDcgQEAgdHlwZWRlZiB1TG9uZyBGQVIgdUxvbmdmOwogICAgdHlwZWRlZiB1bnNpZ25lZCBsb25nIHpfY3JjX3Q7CiAjZW5kaWYKIAotI2lmZGVmIEhBVkVfVU5JU1REX0ggICAgLyogbWF5IGJlIHNldCB0byAjaWYgMSBieSAuL2NvbmZpZ3VyZSAqLworI2lmICFkZWZpbmVkKF9XSU4zMikKICMgIGRlZmluZSBaX0hBVkVfVU5JU1REX0gKICNlbmRpZgogCmRpZmYgLS1naXQgYS96bGliLmggYi96bGliLmgKaW5kZXggZjA5Y2RhZjFlMDU0Li45OWZkNDY3ZjZiMWEgMTAwNjQ0Ci0tLSBhL3psaWIuaAorKysgYi96bGliLmgKQEAgLTE4MjQsNiArMTgyNCwxMSBAQCBaRVhURVJOIGludCBaRVhQT1JUIGd6Z2V0Y18gT0YoKGd6RmlsZSBmaWxlKSk7ICAvKiBiYWNrd2FyZCBjb21wYXRpYmlsaXR5ICovCiAjICB1bmRlZiB6X2d6Z2V0YwogIyAgZGVmaW5lIHpfZ3pnZXRjKGcpIFwKICAgICAgICAgICAoKGcpLT5oYXZlID8gKChnKS0+aGF2ZS0tLCAoZyktPnBvcysrLCAqKChnKS0+bmV4dCkrKykgOiAoZ3pnZXRjKShnKSkKKyNlbGlmIGRlZmluZWQoWl9DUl9QUkVGSVhfU0VUKQorIyAgICB1bmRlZiBnemdldGMKKyMgICAgZGVmaW5lIGd6Z2V0YyhnKSBcCisgICAgICAgICAgKChnKS0+aGF2ZSA/ICgoZyktPmhhdmUtLSwgKGcpLT5wb3MrKywgKigoZyktPm5leHQpKyspIFwKKyAgICAgICAgICAgICAgICAgICAgIDogKENyX3pfZ3pnZXRjKShnKSkKICNlbHNlCiAjICBkZWZpbmUgZ3pnZXRjKGcpIFwKICAgICAgICAgICAoKGcpLT5oYXZlID8gKChnKS0+aGF2ZS0tLCAoZyktPnBvcysrLCAqKChnKS0+bmV4dCkrKykgOiAoZ3pnZXRjKShnKSkKQEAgLTE4NTMsMTEgKzE4NTgsMjkgQEAgWkVYVEVSTiBpbnQgWkVYUE9SVCBnemdldGNfIE9GKChnekZpbGUgZmlsZSkpOyAgLyogYmFja3dhcmQgY29tcGF0aWJpbGl0eSAqLwogIyAgICBkZWZpbmUgel9hZGxlcjMyX2NvbWJpbmUgel9hZGxlcjMyX2NvbWJpbmU2NAogIyAgICBkZWZpbmUgel9jcmMzMl9jb21iaW5lIHpfY3JjMzJfY29tYmluZTY0CiAjICBlbHNlCisjICAgIGlmZGVmIGd6b3BlbgorIyAgICAgIHVuZGVmIGd6b3BlbgorIyAgICBlbmRpZgogIyAgICBkZWZpbmUgZ3pvcGVuIGd6b3BlbjY0CisjICAgIGlmZGVmIGd6c2VlaworIyAgICAgIHVuZGVmIGd6c2VlaworIyAgICBlbmRpZgogIyAgICBkZWZpbmUgZ3pzZWVrIGd6c2VlazY0CisjICAgIGlmZGVmIGd6dGVsbAorIyAgICAgIHVuZGVmIGd6dGVsbAorIyAgICBlbmRpZgogIyAgICBkZWZpbmUgZ3p0ZWxsIGd6dGVsbDY0CisjICAgIGlmZGVmIGd6b2Zmc2V0CisjICAgICAgdW5kZWYgZ3pvZmZzZXQKKyMgICAgZW5kaWYKICMgICAgZGVmaW5lIGd6b2Zmc2V0IGd6b2Zmc2V0NjQKKyMgICAgaWZkZWYgYWRsZXIzMl9jb21iaW5lCisjICAgICAgdW5kZWYgYWRsZXIzMl9jb21iaW5lCisjICAgIGVuZGlmCiAjICAgIGRlZmluZSBhZGxlcjMyX2NvbWJpbmUgYWRsZXIzMl9jb21iaW5lNjQKKyMgICAgaWZkZWYgY3JjMzJfY29tYmluZQorIyAgICAgIHVuZGVmIGNyYzMyX2NvbWJpbmUKKyMgICAgZW5kaWYKICMgICAgZGVmaW5lIGNyYzMyX2NvbWJpbmUgY3JjMzJfY29tYmluZTY0CiAjICBlbmRpZgogIyAgaWZuZGVmIFpfTEFSR0U2NApkaWZmIC0tZ2l0IGEvenV0aWwuaCBiL3p1dGlsLmgKaW5kZXggYjA3OWVhNmE4MGY1Li44MDM3NWI4YjYxMDkgMTAwNjQ0Ci0tLSBhL3p1dGlsLmgKKysrIGIvenV0aWwuaApAQCAtMjgsNiArMjgsMjEgQEAKICMgIGluY2x1ZGUgPHN0cmluZy5oPgogIyAgaW5jbHVkZSA8c3RkbGliLmg+CiAjZW5kaWYKKyNpZmRlZiBOT19FUlJOT19ICisjICAgaWZkZWYgX1dJTjMyX1dDRQorICAgICAgLyogVGhlIE1pY3Jvc29mdCBDIFJ1bi1UaW1lIExpYnJhcnkgZm9yIFdpbmRvd3MgQ0UgZG9lc24ndCBoYXZlCisgICAgICAgKiBlcnJuby4gIFdlIGRlZmluZSBpdCBhcyBhIGdsb2JhbCB2YXJpYWJsZSB0byBzaW1wbGlmeSBwb3J0aW5nLgorICAgICAgICogSXRzIHZhbHVlIGlzIGFsd2F5cyAwIGFuZCBzaG91bGQgbm90IGJlIHVzZWQuICBXZSByZW5hbWUgaXQgdG8KKyAgICAgICAqIGF2b2lkIGNvbmZsaWN0IHdpdGggb3RoZXIgbGlicmFyaWVzIHRoYXQgdXNlIHRoZSBzYW1lIHdvcmthcm91bmQuCisgICAgICAgKi8KKyMgICAgIGRlZmluZSBlcnJubyB6X2Vycm5vCisjICAgZW5kaWYKKyAgICBleHRlcm4gaW50IGVycm5vOworI2Vsc2UKKyMgIGlmbmRlZiBfV0lOMzJfV0NFCisjICAgIGluY2x1ZGUgPGVycm5vLmg+CisjICBlbmRpZgorI2VuZGlmCiAKICNpZmRlZiBaX1NPTE8KICAgIHR5cGVkZWYgbG9uZyBwdHJkaWZmX3Q7ICAvKiBndWVzcyAtLSB3aWxsIGJlIGNhdWdodCBpZiBndWVzcyBpcyB3cm9uZyAqLwo= \ No newline at end of file diff --git a/testing/chromium/patches/0001-fix-building-without-safebrowsing.patch b/testing/chromium/patches/0001-fix-building-without-safebrowsing.patch deleted file mode 100644 index a27ef157..00000000 --- a/testing/chromium/patches/0001-fix-building-without-safebrowsing.patch +++ /dev/null @@ -1,1237 +0,0 @@ ---- a/chrome/browser/chrome_content_browser_client.cc -+++ b/chrome/browser/chrome_content_browser_client.cc -@@ -889,30 +889,6 @@ void SetApplicationLocaleOnIOThread(cons - GetIOThreadApplicationLocale() = locale; - } - --// An implementation of the SSLCertReporter interface used by --// SSLErrorHandler. Uses CertificateReportingService to send reports. The --// service handles queueing and re-sending of failed reports. Each certificate --// error creates a new instance of this class. --class CertificateReportingServiceCertReporter : public SSLCertReporter { -- public: -- explicit CertificateReportingServiceCertReporter( -- content::WebContents* web_contents) -- : service_(CertificateReportingServiceFactory::GetForBrowserContext( -- web_contents->GetBrowserContext())) {} -- ~CertificateReportingServiceCertReporter() override {} -- -- // SSLCertReporter implementation -- void ReportInvalidCertificateChain( -- const std::string& serialized_report) override { -- service_->Send(serialized_report); -- } -- -- private: -- CertificateReportingService* service_; -- -- DISALLOW_COPY_AND_ASSIGN(CertificateReportingServiceCertReporter); --}; -- - #if defined(OS_ANDROID) - float GetDeviceScaleAdjustment() { - static const float kMinFSM = 1.05f; -@@ -2130,7 +2106,7 @@ void ChromeContentBrowserClient::AppendE - // Disable client-side phishing detection in the renderer if it is - // disabled in the Profile preferences or the browser process. - if (!prefs->GetBoolean(prefs::kSafeBrowsingEnabled) || -- !g_browser_process->safe_browsing_detection_service()) { -+ true) { - command_line->AppendSwitch( - switches::kDisableClientSidePhishingDetection); - } -@@ -2789,7 +2765,7 @@ void ChromeContentBrowserClient::AllowCe - SSLErrorHandler::HandleSSLError( - web_contents, cert_error, ssl_info, request_url, - expired_previous_decision, -- std::make_unique(web_contents), -+ nullptr, - callback, SSLErrorHandler::BlockingPageReadyCallback()); - } - -@@ -3076,8 +3052,6 @@ bool ChromeContentBrowserClient::CanCrea - void ChromeContentBrowserClient::ResourceDispatcherHostCreated() { - DCHECK_CURRENTLY_ON(BrowserThread::UI); - -- safe_browsing_service_ = g_browser_process->safe_browsing_service(); -- - for (size_t i = 0; i < extra_parts_.size(); ++i) - extra_parts_[i]->ResourceDispatcherHostCreated(); - -@@ -4350,7 +4324,7 @@ ChromeContentBrowserClient::CreateThrott - if (base::FeatureList::IsEnabled(features::kSSLCommittedInterstitials)) { - throttles.push_back(std::make_unique( - handle, -- std::make_unique(web_contents), -+ nullptr, - base::Bind(&SSLErrorHandler::HandleSSLError))); - } - -@@ -4382,11 +4356,6 @@ ChromeContentBrowserClient::CreateThrott - PreviewsLitePageDecider::MaybeCreateThrottleFor(handle); - if (previews_lite_page_throttle) - throttles.push_back(std::move(previews_lite_page_throttle)); -- if (base::FeatureList::IsEnabled(safe_browsing::kCommittedSBInterstitials)) { -- throttles.push_back( -- std::make_unique( -- handle)); -- } - - #if defined(OS_WIN) || defined(OS_MACOSX) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ---- a/chrome/browser/profiles/profile_impl.cc -+++ b/chrome/browser/profiles/profile_impl.cc -@@ -562,18 +562,6 @@ ProfileImpl::ProfileImpl( - create_mode == CREATE_MODE_SYNCHRONOUS); - #endif - -- scoped_refptr safe_browsing_service( -- g_browser_process->safe_browsing_service()); -- prefs::mojom::TrackedPreferenceValidationDelegatePtr pref_validation_delegate; -- if (safe_browsing_service.get()) { -- auto pref_validation_delegate_impl = -- safe_browsing_service->CreatePreferenceValidationDelegate(this); -- if (pref_validation_delegate_impl) { -- mojo::MakeStrongBinding(std::move(pref_validation_delegate_impl), -- mojo::MakeRequest(&pref_validation_delegate)); -- } -- } -- - content::BrowserContext::Initialize(this, path_); - - { -@@ -582,7 +570,7 @@ ProfileImpl::ProfileImpl( - ->CreateDelegate(); - delegate->InitPrefRegistry(pref_registry_.get()); - prefs_ = chrome_prefs::CreateProfilePrefs( -- path_, std::move(pref_validation_delegate), -+ path_, nullptr, - profile_policy_connector_->policy_service(), supervised_user_settings, - CreateExtensionPrefStore(this, false), pref_registry_, async_prefs, - GetIOTaskRunner(), std::move(delegate)); ---- a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc -+++ b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc -@@ -290,8 +290,7 @@ void NotifyUIThreadOfRequestComplete( - } // namespace - - ChromeResourceDispatcherHostDelegate::ChromeResourceDispatcherHostDelegate() -- : download_request_limiter_(g_browser_process->download_request_limiter()), -- safe_browsing_(g_browser_process->safe_browsing_service()) {} -+ : download_request_limiter_(g_browser_process->download_request_limiter()) {} - - ChromeResourceDispatcherHostDelegate::~ChromeResourceDispatcherHostDelegate() { - #if BUILDFLAG(ENABLE_EXTENSIONS) -@@ -305,8 +304,6 @@ void ChromeResourceDispatcherHostDelegat - content::AppCacheService* appcache_service, - ResourceType resource_type, - std::vector>* throttles) { -- if (safe_browsing_.get()) -- safe_browsing_->OnResourceRequest(request); - ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context); - - #if BUILDFLAG(ENABLE_OFFLINE_PAGES) || BUILDFLAG(ENABLE_NACL) ---- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc -+++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc -@@ -267,117 +267,6 @@ LookalikeUrlInterstitialPage* CreateLook - safe_url)); - } - --safe_browsing::SafeBrowsingBlockingPage* CreateSafeBrowsingBlockingPage( -- content::WebContents* web_contents) { -- safe_browsing::SBThreatType threat_type = -- safe_browsing::SB_THREAT_TYPE_URL_MALWARE; -- GURL request_url("http://example.com"); -- std::string url_param; -- if (net::GetValueForKeyInQuery(web_contents->GetURL(), -- "url", -- &url_param)) { -- if (GURL(url_param).is_valid()) { -- request_url = GURL(url_param); -- } -- } -- GURL main_frame_url(request_url); -- // TODO(mattm): add flag to change main_frame_url or add dedicated flag to -- // test subresource interstitials. -- std::string type_param; -- if (net::GetValueForKeyInQuery(web_contents->GetURL(), -- "type", -- &type_param)) { -- if (type_param == "malware") { -- threat_type = safe_browsing::SB_THREAT_TYPE_URL_MALWARE; -- } else if (type_param == "phishing") { -- threat_type = safe_browsing::SB_THREAT_TYPE_URL_PHISHING; -- } else if (type_param == "unwanted") { -- threat_type = safe_browsing::SB_THREAT_TYPE_URL_UNWANTED; -- } else if (type_param == "clientside_malware") { -- threat_type = safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE; -- } else if (type_param == "clientside_phishing") { -- threat_type = safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING; -- } else if (type_param == "billing") { -- threat_type = safe_browsing::SB_THREAT_TYPE_BILLING; -- } -- } -- safe_browsing::SafeBrowsingBlockingPage::UnsafeResource resource; -- resource.url = request_url; -- resource.is_subresource = request_url != main_frame_url; -- resource.is_subframe = false; -- resource.threat_type = threat_type; -- resource.web_contents_getter = -- security_interstitials::UnsafeResource::GetWebContentsGetter( -- web_contents->GetMainFrame()->GetProcess()->GetID(), -- web_contents->GetMainFrame()->GetRoutingID()); -- resource.threat_source = g_browser_process->safe_browsing_service() -- ->database_manager() -- ->GetThreatSource(); -- -- // Normally safebrowsing interstitial types which block the main page load -- // (SB_THREAT_TYPE_URL_MALWARE, SB_THREAT_TYPE_URL_PHISHING, and -- // SB_THREAT_TYPE_URL_UNWANTED on main-frame loads) would expect there to be a -- // pending navigation when the SafeBrowsingBlockingPage is created. This demo -- // creates a SafeBrowsingBlockingPage but does not actually show a real -- // interstitial. Instead it extracts the html and displays it manually, so the -- // parts which depend on the NavigationEntry are not hit. -- return safe_browsing::SafeBrowsingBlockingPage::CreateBlockingPage( -- g_browser_process->safe_browsing_service()->ui_manager().get(), -- web_contents, main_frame_url, resource); --} -- --TestSafeBrowsingBlockingPageQuiet* CreateSafeBrowsingQuietBlockingPage( -- content::WebContents* web_contents) { -- safe_browsing::SBThreatType threat_type = -- safe_browsing::SB_THREAT_TYPE_URL_MALWARE; -- GURL request_url("http://example.com"); -- std::string url_param; -- if (net::GetValueForKeyInQuery(web_contents->GetURL(), "url", &url_param)) { -- if (GURL(url_param).is_valid()) -- request_url = GURL(url_param); -- } -- GURL main_frame_url(request_url); -- std::string type_param; -- bool is_giant_webview = false; -- if (net::GetValueForKeyInQuery(web_contents->GetURL(), "type", &type_param)) { -- if (type_param == "malware") { -- threat_type = safe_browsing::SB_THREAT_TYPE_URL_MALWARE; -- } else if (type_param == "phishing") { -- threat_type = safe_browsing::SB_THREAT_TYPE_URL_PHISHING; -- } else if (type_param == "unwanted") { -- threat_type = safe_browsing::SB_THREAT_TYPE_URL_UNWANTED; -- } else if (type_param == "billing") { -- threat_type = safe_browsing::SB_THREAT_TYPE_BILLING; -- } else if (type_param == "giant") { -- threat_type = safe_browsing::SB_THREAT_TYPE_URL_MALWARE; -- is_giant_webview = true; -- } -- } -- safe_browsing::SafeBrowsingBlockingPage::UnsafeResource resource; -- resource.url = request_url; -- resource.is_subresource = request_url != main_frame_url; -- resource.is_subframe = false; -- resource.threat_type = threat_type; -- resource.web_contents_getter = -- security_interstitials::UnsafeResource::GetWebContentsGetter( -- web_contents->GetMainFrame()->GetProcess()->GetID(), -- web_contents->GetMainFrame()->GetRoutingID()); -- resource.threat_source = g_browser_process->safe_browsing_service() -- ->database_manager() -- ->GetThreatSource(); -- -- // Normally safebrowsing interstitial types which block the main page load -- // (SB_THREAT_TYPE_URL_MALWARE, SB_THREAT_TYPE_URL_PHISHING, and -- // SB_THREAT_TYPE_URL_UNWANTED on main-frame loads) would expect there to be a -- // pending navigation when the SafeBrowsingBlockingPage is created. This demo -- // creates a SafeBrowsingBlockingPage but does not actually show a real -- // interstitial. Instead it extracts the html and displays it manually, so the -- // parts which depend on the NavigationEntry are not hit. -- return TestSafeBrowsingBlockingPageQuiet::CreateBlockingPage( -- g_browser_process->safe_browsing_service()->ui_manager().get(), -- web_contents, main_frame_url, resource, is_giant_webview); --} -- - #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION) - CaptivePortalBlockingPage* CreateCaptivePortalBlockingPage( - content::WebContents* web_contents) { -@@ -484,8 +373,6 @@ void InterstitialHTMLSource::StartDataRe - interstitial_delegate.reset(CreateSSLBlockingPage(web_contents)); - } else if (path_without_query == "/mitm-software-ssl") { - interstitial_delegate.reset(CreateMITMSoftwareBlockingPage(web_contents)); -- } else if (path_without_query == "/safebrowsing") { -- interstitial_delegate.reset(CreateSafeBrowsingBlockingPage(web_contents)); - } else if (path_without_query == "/clock") { - interstitial_delegate.reset(CreateBadClockBlockingPage(web_contents)); - } else if (path_without_query == "/lookalike") { -@@ -501,11 +388,6 @@ void InterstitialHTMLSource::StartDataRe - - if (path_without_query == "/supervised_user") { - html = GetSupervisedUserInterstitialHTML(path); -- } else if (path_without_query == "/quietsafebrowsing") { -- TestSafeBrowsingBlockingPageQuiet* blocking_page = -- CreateSafeBrowsingQuietBlockingPage(web_contents); -- interstitial_delegate.reset(blocking_page); -- html = blocking_page->GetHTML(); - } else if (interstitial_delegate.get()) { - html = interstitial_delegate.get()->GetHTMLContents(); - } else { ---- a/chrome/browser/extensions/blacklist_state_fetcher.cc -+++ b/chrome/browser/extensions/blacklist_state_fetcher.cc -@@ -32,28 +32,9 @@ BlacklistStateFetcher::~BlacklistStateFe - void BlacklistStateFetcher::Request(const std::string& id, - const RequestCallback& callback) { - DCHECK_CURRENTLY_ON(BrowserThread::UI); -- if (!safe_browsing_config_) { -- if (g_browser_process && g_browser_process->safe_browsing_service()) { -- SetSafeBrowsingConfig( -- g_browser_process->safe_browsing_service()->GetV4ProtocolConfig()); -- } else { -- base::ThreadTaskRunnerHandle::Get()->PostTask( -- FROM_HERE, base::BindOnce(callback, BLACKLISTED_UNKNOWN)); -- return; -- } -- } -- -- bool request_already_sent = base::ContainsKey(callbacks_, id); -- callbacks_.insert(std::make_pair(id, callback)); -- if (request_already_sent) -- return; -- -- if (g_browser_process && g_browser_process->safe_browsing_service()) { -- url_loader_factory_ = -- g_browser_process->safe_browsing_service()->GetURLLoaderFactory(); -- } -- -- SendRequest(id); -+ base::ThreadTaskRunnerHandle::Get()->PostTask( -+ FROM_HERE, base::BindOnce(callback, BLACKLISTED_UNKNOWN)); -+ return; - } - - void BlacklistStateFetcher::SendRequest(const std::string& id) { -@@ -64,8 +45,7 @@ void BlacklistStateFetcher::SendRequest( - std::string request_str; - request.SerializeToString(&request_str); - -- GURL request_url = GURL(safe_browsing::GetReportUrl( -- *safe_browsing_config_, "clientreport/crx-list-info")); -+ GURL request_url = GURL(); - net::NetworkTrafficAnnotationTag traffic_annotation = - net::DefineNetworkTrafficAnnotation("extension_blacklist", R"( - semantics { -@@ -112,12 +92,6 @@ void BlacklistStateFetcher::SendRequest( - base::Unretained(this), fetcher)); - } - --void BlacklistStateFetcher::SetSafeBrowsingConfig( -- const safe_browsing::V4ProtocolConfig& config) { -- safe_browsing_config_ = -- std::make_unique(config); --} -- - void BlacklistStateFetcher::OnURLLoaderComplete( - network::SimpleURLLoader* url_loader, - std::unique_ptr response_body) { ---- a/chrome/browser/extensions/blacklist_state_fetcher.h -+++ b/chrome/browser/extensions/blacklist_state_fetcher.h -@@ -34,8 +34,6 @@ class BlacklistStateFetcher { - - virtual void Request(const std::string& id, const RequestCallback& callback); - -- void SetSafeBrowsingConfig(const safe_browsing::V4ProtocolConfig& config); -- - protected: - void OnURLLoaderComplete(network::SimpleURLLoader* url_loader, - std::unique_ptr response_body); -@@ -54,7 +52,6 @@ class BlacklistStateFetcher { - - void SendRequest(const std::string& id); - -- std::unique_ptr safe_browsing_config_; - scoped_refptr url_loader_factory_; - - // SimpleURLLoader -> (owned loader, extension id). ---- a/chrome/browser/download/chrome_download_manager_delegate.cc -+++ b/chrome/browser/download/chrome_download_manager_delegate.cc -@@ -320,13 +320,6 @@ ChromeDownloadManagerDelegate::~ChromeDo - - void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) { - download_manager_ = dm; -- -- safe_browsing::SafeBrowsingService* sb_service = -- g_browser_process->safe_browsing_service(); -- if (sb_service && !profile_->IsOffTheRecord()) { -- // Include this download manager in the set monitored by safe browsing. -- sb_service->AddDownloadManager(dm); -- } - } - - #if defined(OS_ANDROID) -@@ -637,16 +630,6 @@ void ChromeDownloadManagerDelegate::Choo - - void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName( - base::FilePath* filename) { -- safe_browsing::FileTypePolicies* file_type_policies = -- safe_browsing::FileTypePolicies::GetInstance(); -- -- if (file_type_policies->GetFileDangerLevel(*filename) == -- safe_browsing::DownloadFileType::NOT_DANGEROUS) -- return; -- -- base::FilePath default_filename = base::FilePath::FromUTF8Unsafe( -- l10n_util::GetStringUTF8(IDS_DEFAULT_DOWNLOAD_FILENAME)); -- *filename = filename->AddExtension(default_filename.BaseName().value()); - } - - void ChromeDownloadManagerDelegate::OpenDownloadUsingPlatformHandler( ---- a/chrome/browser/browser_process_impl.cc -+++ b/chrome/browser/browser_process_impl.cc -@@ -73,7 +73,6 @@ - #include "chrome/browser/printing/print_preview_dialog_controller.h" - #include "chrome/browser/profiles/profile_manager.h" - #include "chrome/browser/resource_coordinator/resource_coordinator_parts.h" --#include "chrome/browser/safe_browsing/safe_browsing_service.h" - #include "chrome/browser/shell_integration.h" - #include "chrome/browser/site_isolation/prefs_observer.h" - #include "chrome/browser/startup_data.h" -@@ -386,8 +385,6 @@ void BrowserProcessImpl::StartTearDown() - // that URLFetcher operation before going away.) - metrics_services_manager_.reset(); - intranet_redirect_detector_.reset(); -- if (safe_browsing_service_.get()) -- safe_browsing_service()->ShutDown(); - network_time_tracker_.reset(); - #if BUILDFLAG(ENABLE_PLUGINS) - plugins_resource_service_.reset(); -@@ -1008,22 +1005,6 @@ StatusTray* BrowserProcessImpl::status_t - return status_tray_.get(); - } - --safe_browsing::SafeBrowsingService* --BrowserProcessImpl::safe_browsing_service() { -- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -- if (!created_safe_browsing_service_) -- CreateSafeBrowsingService(); -- return safe_browsing_service_.get(); --} -- --safe_browsing::ClientSideDetectionService* -- BrowserProcessImpl::safe_browsing_detection_service() { -- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -- if (safe_browsing_service()) -- return safe_browsing_service()->safe_browsing_detection_service(); -- return NULL; --} -- - subresource_filter::RulesetService* - BrowserProcessImpl::subresource_filter_ruleset_service() { - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -1311,16 +1292,6 @@ void BrowserProcessImpl::CreateBackgroun - #endif - } - --void BrowserProcessImpl::CreateSafeBrowsingService() { -- DCHECK(!safe_browsing_service_); -- // Set this flag to true so that we don't retry indefinitely to -- // create the service class if there was an error. -- created_safe_browsing_service_ = true; -- safe_browsing_service_ = -- safe_browsing::SafeBrowsingService::CreateSafeBrowsingService(); -- safe_browsing_service_->Initialize(); --} -- - void BrowserProcessImpl::CreateSubresourceFilterRulesetService() { - DCHECK(!subresource_filter_ruleset_service_); - created_subresource_filter_ruleset_service_ = true; ---- a/chrome/browser/browser_process_impl.h -+++ b/chrome/browser/browser_process_impl.h -@@ -173,9 +173,6 @@ class BrowserProcessImpl : public Browse - void set_background_mode_manager_for_test( - std::unique_ptr manager) override; - StatusTray* status_tray() override; -- safe_browsing::SafeBrowsingService* safe_browsing_service() override; -- safe_browsing::ClientSideDetectionService* safe_browsing_detection_service() -- override; - subresource_filter::RulesetService* subresource_filter_ruleset_service() - override; - optimization_guide::OptimizationGuideService* optimization_guide_service() -@@ -321,9 +318,6 @@ class BrowserProcessImpl : public Browse - std::unique_ptr background_mode_manager_; - #endif - -- bool created_safe_browsing_service_ = false; -- scoped_refptr safe_browsing_service_; -- - bool created_subresource_filter_ruleset_service_ = false; - std::unique_ptr - subresource_filter_ruleset_service_; ---- a/chrome/browser/browser_process.h -+++ b/chrome/browser/browser_process.h -@@ -44,10 +44,6 @@ class NetworkQualityTracker; - class SharedURLLoaderFactory; - } - --namespace safe_browsing { --class SafeBrowsingService; --} -- - namespace subresource_filter { - class RulesetService; - } -@@ -117,10 +113,6 @@ class ResourceCoordinatorParts; - class TabManager; - } - --namespace safe_browsing { --class ClientSideDetectionService; --} -- - // NOT THREAD SAFE, call only from the main thread. - // These functions shouldn't return NULL unless otherwise noted. - class BrowserProcess { -@@ -235,14 +227,6 @@ class BrowserProcess { - // on this platform (or this is a unit test). - virtual StatusTray* status_tray() = 0; - -- // Returns the SafeBrowsing service. -- virtual safe_browsing::SafeBrowsingService* safe_browsing_service() = 0; -- -- // Returns an object which handles communication with the SafeBrowsing -- // client-side detection servers. -- virtual safe_browsing::ClientSideDetectionService* -- safe_browsing_detection_service() = 0; -- - // Returns the service providing versioned storage for rules used by the Safe - // Browsing subresource filter. - virtual subresource_filter::RulesetService* ---- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.h -+++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.h -@@ -12,7 +12,6 @@ - - #include "base/macros.h" - #include "base/memory/weak_ptr.h" --#include "chrome/browser/download/download_danger_prompt.h" - #include "chrome/browser/ui/webui/downloads/downloads_list_tracker.h" - #include "chrome/browser/ui/webui/downloads/downloads.mojom.h" - #include "content/public/browser/web_contents_observer.h" -@@ -85,18 +84,6 @@ class DownloadsDOMHandler : public conte - // null-checking |original_notifier_|. - content::DownloadManager* GetOriginalNotifierManager() const; - -- // Displays a native prompt asking the user for confirmation after accepting -- // the dangerous download specified by |dangerous|. The function returns -- // immediately, and will invoke DangerPromptAccepted() asynchronously if the -- // user accepts the dangerous download. The native prompt will observe -- // |dangerous| until either the dialog is dismissed or |dangerous| is no -- // longer an in-progress dangerous download. -- virtual void ShowDangerPrompt(download::DownloadItem* dangerous); -- -- // Conveys danger acceptance from the DownloadDangerPrompt to the -- // DownloadItem. -- void DangerPromptDone(int download_id, DownloadDangerPrompt::Action action); -- - // Returns true if the records of any downloaded items are allowed (and able) - // to be deleted. - bool IsDeletingHistoryAllowed(); ---- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc -+++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc -@@ -22,7 +22,6 @@ - #include "base/threading/thread.h" - #include "base/values.h" - #include "chrome/browser/browser_process.h" --#include "chrome/browser/download/download_danger_prompt.h" - #include "chrome/browser/download/download_history.h" - #include "chrome/browser/download/download_item_model.h" - #include "chrome/browser/download/download_prefs.h" -@@ -162,9 +161,6 @@ void DownloadsDOMHandler::SaveDangerousR - } - - CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_SAVE_DANGEROUS); -- download::DownloadItem* file = GetDownloadByStringId(id); -- if (file) -- ShowDangerPrompt(file); - } - - void DownloadsDOMHandler::DiscardDangerous(const std::string& id) { -@@ -307,12 +303,6 @@ void DownloadsDOMHandler::RemoveDownload - IdSet ids; - - for (auto* download : to_remove) { -- if (download->IsDangerous()) { -- // Don't allow users to revive dangerous downloads; just nuke 'em. -- download->Remove(); -- continue; -- } -- - DownloadItemModel item_model(download); - if (!item_model.ShouldShowInShelf() || - download->GetState() == download::DownloadItem::IN_PROGRESS) { -@@ -369,32 +359,6 @@ void DownloadsDOMHandler::FinalizeRemova - } - } - --void DownloadsDOMHandler::ShowDangerPrompt( -- download::DownloadItem* dangerous_item) { -- DownloadDangerPrompt* danger_prompt = DownloadDangerPrompt::Create( -- dangerous_item, GetWebUIWebContents(), false, -- base::Bind(&DownloadsDOMHandler::DangerPromptDone, -- weak_ptr_factory_.GetWeakPtr(), dangerous_item->GetId())); -- // danger_prompt will delete itself. -- DCHECK(danger_prompt); --} -- --void DownloadsDOMHandler::DangerPromptDone( -- int download_id, -- DownloadDangerPrompt::Action action) { -- if (action != DownloadDangerPrompt::ACCEPT) -- return; -- download::DownloadItem* item = NULL; -- if (GetMainNotifierManager()) -- item = GetMainNotifierManager()->GetDownload(download_id); -- if (!item && GetOriginalNotifierManager()) -- item = GetOriginalNotifierManager()->GetDownload(download_id); -- if (!item || item->IsDone()) -- return; -- CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_SAVE_DANGEROUS); -- item->ValidateDangerousDownload(); --} -- - bool DownloadsDOMHandler::IsDeletingHistoryAllowed() { - content::DownloadManager* manager = GetMainNotifierManager(); - return manager && ---- a/chrome/browser/extensions/api/downloads/downloads_api.cc -+++ b/chrome/browser/extensions/api/downloads/downloads_api.cc -@@ -38,7 +38,6 @@ - #include "chrome/browser/browser_process.h" - #include "chrome/browser/download/download_core_service.h" - #include "chrome/browser/download/download_core_service_factory.h" --#include "chrome/browser/download/download_danger_prompt.h" - #include "chrome/browser/download/download_file_icon_extractor.h" - #include "chrome/browser/download/download_open_prompt.h" - #include "chrome/browser/download/download_prefs.h" -@@ -1304,9 +1303,6 @@ DownloadsAcceptDangerFunction::Downloads - - DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {} - --DownloadsAcceptDangerFunction::OnPromptCreatedCallback* -- DownloadsAcceptDangerFunction::on_prompt_created_ = NULL; -- - bool DownloadsAcceptDangerFunction::RunAsync() { - std::unique_ptr params( - downloads::AcceptDanger::Params::Create(*args_)); -@@ -1344,40 +1340,7 @@ void DownloadsAcceptDangerFunction::Prom - return; - } - RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER); -- // DownloadDangerPrompt displays a modal dialog using native widgets that the -- // user must either accept or cancel. It cannot be scripted. -- DownloadDangerPrompt* prompt = DownloadDangerPrompt::Create( -- download_item, -- web_contents, -- true, -- base::Bind(&DownloadsAcceptDangerFunction::DangerPromptCallback, -- this, download_id)); -- // DownloadDangerPrompt deletes itself -- if (on_prompt_created_ && !on_prompt_created_->is_null()) -- on_prompt_created_->Run(prompt); -- // Function finishes in DangerPromptCallback(). --} -- --void DownloadsAcceptDangerFunction::DangerPromptCallback( -- int download_id, DownloadDangerPrompt::Action action) { -- DCHECK_CURRENTLY_ON(BrowserThread::UI); -- DownloadItem* download_item = GetDownload( -- browser_context(), include_incognito_information(), download_id); -- if (InvalidId(download_item, &error_) || -- Fault(download_item->GetState() != DownloadItem::IN_PROGRESS, -- download_extension_errors::kNotInProgress, &error_)) -- return; -- switch (action) { -- case DownloadDangerPrompt::ACCEPT: -- download_item->ValidateDangerousDownload(); -- break; -- case DownloadDangerPrompt::CANCEL: -- download_item->Remove(); -- break; -- case DownloadDangerPrompt::DISMISS: -- break; -- } -- SendResponse(error_.empty()); -+ download_item->ValidateDangerousDownload(); - } - - DownloadsShowFunction::DownloadsShowFunction() {} ---- a/chrome/browser/extensions/api/downloads/downloads_api.h -+++ b/chrome/browser/extensions/api/downloads/downloads_api.h -@@ -13,7 +13,6 @@ - #include "base/macros.h" - #include "base/scoped_observer.h" - #include "base/time/time.h" --#include "chrome/browser/download/download_danger_prompt.h" - #include "chrome/browser/extensions/chrome_extension_function.h" - #include "chrome/common/extensions/api/downloads.h" - #include "components/download/content/public/all_download_item_notifier.h" -@@ -189,25 +188,16 @@ class DownloadsRemoveFileFunction : publ - - class DownloadsAcceptDangerFunction : public ChromeAsyncExtensionFunction { - public: -- typedef base::Callback OnPromptCreatedCallback; -- static void OnPromptCreatedForTesting( -- OnPromptCreatedCallback* callback) { -- on_prompt_created_ = callback; -- } -- - DECLARE_EXTENSION_FUNCTION("downloads.acceptDanger", DOWNLOADS_ACCEPTDANGER) - DownloadsAcceptDangerFunction(); - bool RunAsync() override; - - protected: - ~DownloadsAcceptDangerFunction() override; -- void DangerPromptCallback(int download_id, -- DownloadDangerPrompt::Action action); - - private: - void PromptOrWait(int download_id, int retries); - -- static OnPromptCreatedCallback* on_prompt_created_; - DISALLOW_COPY_AND_ASSIGN(DownloadsAcceptDangerFunction); - }; - ---- a/chrome/browser/download/download_prefs.cc -+++ b/chrome/browser/download/download_prefs.cc -@@ -224,14 +224,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr - base::FilePath::StringType(1, base::FilePath::kExtensionSeparator) + - extension); - -- // Note that the list of file types that are not allowed to open -- // automatically can change in the future. When the list is tightened, it is -- // expected that some entries in the users' auto open list will get dropped -- // permanently as a result. -- if (FileTypePolicies::GetInstance()->IsAllowedToOpenAutomatically( -- filename_with_extension)) { -- auto_open_.insert(extension); -- } -+ auto_open_.insert(extension); - } - } - -@@ -381,10 +374,6 @@ bool DownloadPrefs::IsAutoOpenEnabledBas - bool DownloadPrefs::EnableAutoOpenBasedOnExtension( - const base::FilePath& file_name) { - base::FilePath::StringType extension = file_name.Extension(); -- if (!FileTypePolicies::GetInstance()->IsAllowedToOpenAutomatically( -- file_name)) { -- return false; -- } - - DCHECK(extension[0] == base::FilePath::kExtensionSeparator); - extension.erase(0, 1); ---- a/chrome/browser/component_updater/file_type_policies_component_installer.cc -+++ b/chrome/browser/component_updater/file_type_policies_component_installer.cc -@@ -38,20 +38,6 @@ const uint8_t kFileTypePoliciesPublicKey - const char kFileTypePoliciesManifestName[] = "File Type Policies"; - - void LoadFileTypesFromDisk(const base::FilePath& pb_path) { -- if (pb_path.empty()) -- return; -- -- VLOG(1) << "Reading Download File Types from file: " << pb_path.value(); -- std::string binary_pb; -- if (!base::ReadFileToString(pb_path, &binary_pb)) { -- // The file won't exist on new installations, so this is not always an -- // error. -- VLOG(1) << "Failed reading from " << pb_path.value(); -- return; -- } -- -- safe_browsing::FileTypePolicies::GetInstance()->PopulateFromDynamicUpdate( -- binary_pb); - } - - } // namespace ---- a/chrome/browser/download/download_target_determiner.cc -+++ b/chrome/browser/download/download_target_determiner.cc -@@ -258,9 +258,7 @@ DownloadTargetDeterminer::Result - // considered safe by safe browsing. Noticed that when generating file name, - // |suggested_filename| and Content-Disposition header have higher priority - // than the URL. -- bool safe_file_ext = -- !safe_browsing::FileTypePolicies::GetInstance()->IsCheckedBinaryFile( -- generated_filename); -+ bool safe_file_ext = true; - net::HttpContentDisposition content_disposition_header( - download_->GetContentDisposition(), referrer_charset); - bool should_replace_extension = -@@ -1028,29 +1026,7 @@ DownloadFileType::DangerLevel DownloadTa - download_->HasUserGesture()) - return DownloadFileType::NOT_DANGEROUS; - -- DownloadFileType::DangerLevel danger_level = -- safe_browsing::FileTypePolicies::GetInstance()->GetFileDangerLevel( -- virtual_path_.BaseName()); -- -- // A danger level of ALLOW_ON_USER_GESTURE is used to label potentially -- // dangerous file types that have a high frequency of legitimate use. We would -- // like to avoid prompting for the legitimate cases as much as possible. To -- // that end, we consider a download to be legitimate if one of the following -- // is true, and avoid prompting: -- // -- // * The user navigated to the download URL via the omnibox (either by typing -- // the URL, pasting it, or using search). -- // -- // * The navigation that initiated the download has a user gesture associated -- // with it AND the user the user is familiar with the referring origin. A -- // user is considered familiar with a referring origin if a visit for a page -- // from the same origin was recorded on the previous day or earlier. -- if (danger_level == DownloadFileType::ALLOW_ON_USER_GESTURE && -- ((download_->GetTransitionType() & -- ui::PAGE_TRANSITION_FROM_ADDRESS_BAR) != 0 || -- (download_->HasUserGesture() && visits == VISITED_REFERRER))) -- return DownloadFileType::NOT_DANGEROUS; -- return danger_level; -+ return DownloadFileType::NOT_DANGEROUS; - } - - void DownloadTargetDeterminer::OnDownloadDestroyed( ---- a/chrome/browser/BUILD.gn -+++ b/chrome/browser/BUILD.gn -@@ -2831,8 +2831,6 @@ jumbo_split_static_library("browser") { - "download/download_commands.h", - "download/download_crx_util.cc", - "download/download_crx_util.h", -- "download/download_danger_prompt.cc", -- "download/download_danger_prompt.h", - "download/download_dir_policy_handler.cc", - "download/download_dir_policy_handler.h", - "download/download_dir_util.cc", ---- a/chrome/browser/ui/BUILD.gn -+++ b/chrome/browser/ui/BUILD.gn -@@ -2514,7 +2514,6 @@ jumbo_split_static_library("ui") { - "views/desktop_capture/desktop_media_tab_list.h", - "views/device_chooser_content_view.cc", - "views/device_chooser_content_view.h", -- "views/download/download_danger_prompt_views.cc", - "views/download/download_in_progress_dialog_view.cc", - "views/download/download_in_progress_dialog_view.h", - "views/download/download_item_view.cc", ---- a/chrome/browser/ssl/security_state_tab_helper.cc -+++ b/chrome/browser/ssl/security_state_tab_helper.cc -@@ -195,77 +195,6 @@ bool SecurityStateTabHelper::UsedPolicyI - - security_state::MaliciousContentStatus - SecurityStateTabHelper::GetMaliciousContentStatus() const { -- content::NavigationEntry* entry = -- web_contents()->GetController().GetVisibleEntry(); -- if (!entry) -- return security_state::MALICIOUS_CONTENT_STATUS_NONE; -- safe_browsing::SafeBrowsingService* sb_service = -- g_browser_process->safe_browsing_service(); -- if (!sb_service) -- return security_state::MALICIOUS_CONTENT_STATUS_NONE; -- scoped_refptr sb_ui_manager = sb_service->ui_manager(); -- safe_browsing::SBThreatType threat_type; -- if (sb_ui_manager->IsUrlWhitelistedOrPendingForWebContents( -- entry->GetURL(), false, entry, web_contents(), false, &threat_type)) { -- switch (threat_type) { -- case safe_browsing::SB_THREAT_TYPE_UNUSED: -- case safe_browsing::SB_THREAT_TYPE_SAFE: -- case safe_browsing::SB_THREAT_TYPE_URL_PHISHING: -- case safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING: -- return security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING; -- case safe_browsing::SB_THREAT_TYPE_URL_MALWARE: -- case safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE: -- return security_state::MALICIOUS_CONTENT_STATUS_MALWARE; -- case safe_browsing::SB_THREAT_TYPE_URL_UNWANTED: -- return security_state::MALICIOUS_CONTENT_STATUS_UNWANTED_SOFTWARE; -- case safe_browsing::SB_THREAT_TYPE_SIGN_IN_PASSWORD_REUSE: --#if defined(FULL_SAFE_BROWSING) -- if (safe_browsing::ChromePasswordProtectionService:: -- ShouldShowPasswordReusePageInfoBubble( -- web_contents(), -- safe_browsing::LoginReputationClientRequest:: -- PasswordReuseEvent::SIGN_IN_PASSWORD)) { -- return security_state:: -- MALICIOUS_CONTENT_STATUS_SIGN_IN_PASSWORD_REUSE; -- } -- // If user has already changed Gaia password, returns the regular -- // social engineering content status. -- return security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING; --#endif -- case safe_browsing::SB_THREAT_TYPE_ENTERPRISE_PASSWORD_REUSE: --#if defined(FULL_SAFE_BROWSING) -- if (safe_browsing::ChromePasswordProtectionService:: -- ShouldShowPasswordReusePageInfoBubble( -- web_contents(), -- safe_browsing::LoginReputationClientRequest:: -- PasswordReuseEvent::ENTERPRISE_PASSWORD)) { -- return security_state:: -- MALICIOUS_CONTENT_STATUS_ENTERPRISE_PASSWORD_REUSE; -- } -- // If user has already changed Gaia password, returns the regular -- // social engineering content status. -- return security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING; --#endif -- case safe_browsing::SB_THREAT_TYPE_BILLING: -- return security_state::MALICIOUS_CONTENT_STATUS_BILLING; -- case safe_browsing:: -- DEPRECATED_SB_THREAT_TYPE_URL_PASSWORD_PROTECTION_PHISHING: -- case safe_browsing::SB_THREAT_TYPE_URL_BINARY_MALWARE: -- case safe_browsing::SB_THREAT_TYPE_EXTENSION: -- case safe_browsing::SB_THREAT_TYPE_BLACKLISTED_RESOURCE: -- case safe_browsing::SB_THREAT_TYPE_API_ABUSE: -- case safe_browsing::SB_THREAT_TYPE_SUBRESOURCE_FILTER: -- case safe_browsing::SB_THREAT_TYPE_CSD_WHITELIST: -- case safe_browsing::SB_THREAT_TYPE_AD_SAMPLE: -- case safe_browsing::SB_THREAT_TYPE_SUSPICIOUS_SITE: -- case safe_browsing::SB_THREAT_TYPE_APK_DOWNLOAD: -- // These threat types are not currently associated with -- // interstitials, and thus resources with these threat types are -- // not ever whitelisted or pending whitelisting. -- NOTREACHED(); -- break; -- } -- } - return security_state::MALICIOUS_CONTENT_STATUS_NONE; - } - ---- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc -+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc -@@ -639,36 +639,6 @@ void ChromeBrowsingDataRemoverDelegate:: - CONTENT_SETTINGS_TYPE_CLIENT_HINTS, base::Time(), base::Time::Max(), - website_settings_filter); - -- // Clear the safebrowsing cookies only if time period is for "all time". It -- // doesn't make sense to apply the time period of deleting in the last X -- // hours/days to the safebrowsing cookies since they aren't the result of -- // any user action. -- if (IsForAllTime()) { -- safe_browsing::SafeBrowsingService* sb_service = -- g_browser_process->safe_browsing_service(); -- if (sb_service) { -- network::mojom::CookieManagerPtr cookie_manager; -- sb_service->GetNetworkContext()->GetCookieManager( -- mojo::MakeRequest(&cookie_manager)); -- -- network::mojom::CookieManager* manager_ptr = cookie_manager.get(); -- -- network::mojom::CookieDeletionFilterPtr deletion_filter = -- filter_builder.BuildCookieDeletionFilter(); -- if (!delete_begin_.is_null()) -- deletion_filter->created_after_time = delete_begin_; -- if (!delete_end_.is_null()) -- deletion_filter->created_before_time = delete_end_; -- -- manager_ptr->DeleteCookies( -- std::move(deletion_filter), -- base::BindOnce( -- &OnClearedCookies, -- CreateTaskCompletionClosure(TracingDataType::kCookies), -- std::move(cookie_manager))); -- } -- } -- - MediaDeviceIDSalt::Reset(profile_->GetPrefs()); - } - ---- a/chrome/browser/metrics/chrome_metrics_service_client.cc -+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -695,9 +695,6 @@ void ChromeMetricsServiceClient::Registe - metrics_service_->RegisterMetricsProvider( - std::make_unique()); - -- metrics_service_->RegisterMetricsProvider( -- std::make_unique()); -- - #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) - metrics_service_->RegisterMetricsProvider( - std::make_unique()); ---- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -238,7 +238,6 @@ void ChromeBrowserMainExtraPartsProfiles - #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION) - CaptivePortalServiceFactory::GetInstance(); - #endif -- CertificateReportingServiceFactory::GetInstance(); - ChromeBrowsingDataRemoverDelegateFactory::GetInstance(); - #if defined(OS_CHROMEOS) - chromeos::android_sms::AndroidSmsServiceFactory::GetInstance(); ---- a/chrome/browser/ssl/captive_portal_blocking_page.cc -+++ b/chrome/browser/ssl/captive_portal_blocking_page.cc -@@ -211,10 +211,7 @@ void CaptivePortalBlockingPage::Populate - load_time_data->SetString("recurrentErrorParagraph", ""); - load_time_data->SetBoolean("show_recurrent_error_paragraph", false); - -- if (cert_report_helper()) -- cert_report_helper()->PopulateExtendedReportingOption(load_time_data); -- else -- load_time_data->SetBoolean(security_interstitials::kDisplayCheckBox, false); -+ load_time_data->SetBoolean(security_interstitials::kDisplayCheckBox, false); - } - - void CaptivePortalBlockingPage::CommandReceived(const std::string& command) { -@@ -229,8 +226,6 @@ void CaptivePortalBlockingPage::CommandR - security_interstitials::SecurityInterstitialCommand cmd = - static_cast( - command_num); -- cert_report_helper()->HandleReportingCommands(cmd, -- controller()->GetPrefService()); - switch (cmd) { - case security_interstitials::CMD_OPEN_LOGIN: - captive_portal::CaptivePortalMetrics::LogCaptivePortalBlockingPageEvent( ---- a/chrome/browser/ssl/cert_report_helper.cc -+++ b/chrome/browser/ssl/cert_report_helper.cc -@@ -179,8 +179,6 @@ void CertReportHelper::FinishCertCollect - LOG(ERROR) << "Failed to serialize certificate report."; - return; - } -- -- ssl_cert_reporter_->ReportInvalidCertificateChain(serialized_report); - } - - bool CertReportHelper::ShouldShowCertificateReporterCheckbox() { ---- a/chrome/browser/ui/tab_helpers.cc -+++ b/chrome/browser/ui/tab_helpers.cc -@@ -242,10 +242,6 @@ void TabHelpers::AttachTabHelpers(WebCon - PreviewsUITabHelper::CreateForWebContents(web_contents); - RecentlyAudibleHelper::CreateForWebContents(web_contents); - ResourceLoadingHintsWebContentsObserver::CreateForWebContents(web_contents); -- safe_browsing::SafeBrowsingNavigationObserver::MaybeCreateForWebContents( -- web_contents); -- safe_browsing::TriggerCreator::MaybeCreateTriggersForWebContents( -- profile, web_contents); - SearchEngineTabHelper::CreateForWebContents(web_contents); - SecurityStateTabHelper::CreateForWebContents(web_contents); - if (SiteEngagementService::IsEnabled()) -@@ -295,7 +291,6 @@ void TabHelpers::AttachTabHelpers(WebCon - web_contents, std::make_unique()); - PluginObserver::CreateForWebContents(web_contents); - SadTabHelper::CreateForWebContents(web_contents); -- safe_browsing::SafeBrowsingTabObserver::CreateForWebContents(web_contents); - SearchTabHelper::CreateForWebContents(web_contents); - TabDialogs::CreateForWebContents(web_contents); - if (base::FeatureList::IsEnabled(features::kTabHoverCardImages)) ---- a/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc -+++ b/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc -@@ -70,20 +70,6 @@ void ChromeSubresourceFilterClient::DidS - void ChromeSubresourceFilterClient::MaybeAppendNavigationThrottles( - content::NavigationHandle* navigation_handle, - std::vector>* throttles) { -- safe_browsing::SafeBrowsingService* safe_browsing_service = -- g_browser_process->safe_browsing_service(); -- if (navigation_handle->IsInMainFrame() && safe_browsing_service) { -- throttles->push_back( -- std::make_unique( -- navigation_handle, this, -- base::CreateSingleThreadTaskRunnerWithTraits( -- {content::BrowserThread::IO}), -- safe_browsing_service->database_manager())); -- } -- -- throttle_manager_->MaybeAppendNavigationThrottles(navigation_handle, -- throttles); - } - - void ChromeSubresourceFilterClient::OnReloadRequested() { ---- a/chrome/browser/safe_browsing/BUILD.gn -+++ b/chrome/browser/safe_browsing/BUILD.gn -@@ -6,6 +6,7 @@ import("//build/config/jumbo.gni") - import("//extensions/buildflags/buildflags.gni") - - jumbo_static_library("safe_browsing") { -+ if (false) { - sources = [ - "safe_browsing_controller_client.cc", - "safe_browsing_controller_client.h", -@@ -100,6 +101,7 @@ jumbo_static_library("safe_browsing") { - } else { - sources += [ "chrome_cleaner/chrome_cleaner_extension_util_win_noop.cc" ] - } -+ } - - if (safe_browsing_mode != 0) { - # "Safe Browsing Basic" files used for safe browsing in full mode ---- a/chrome/renderer/chrome_content_renderer_client.cc -+++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -84,7 +84,6 @@ - #include "components/error_page/common/localized_error.h" - #include "components/network_hints/renderer/prescient_networking_dispatcher.h" - #include "components/pdf/renderer/pepper_pdf_host.h" --#include "components/safe_browsing/renderer/threat_dom_details.h" - #include "components/spellcheck/spellcheck_buildflags.h" - #include "components/startup_metric_utils/common/startup_metric.mojom.h" - #include "components/subresource_filter/content/renderer/subresource_filter_agent.h" ---- a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc -+++ b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc -@@ -112,9 +112,6 @@ void TrialComparisonCertVerifierControll - std::string serialized_report; - if (!report.Serialize(&serialized_report)) - return; -- -- CertificateReportingServiceFactory::GetForBrowserContext(profile_)->Send( -- serialized_report); - } - - // static ---- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -681,51 +681,9 @@ WebstorePrivateGetReferrerChainFunction: - - ExtensionFunction::ResponseAction - WebstorePrivateGetReferrerChainFunction::Run() { -- Profile* profile = chrome_details_.GetProfile(); -- if (!SafeBrowsingNavigationObserverManager::IsEnabledAndReady(profile)) -- return RespondNow(ArgumentList( -- api::webstore_private::GetReferrerChain::Results::Create(""))); -- -- content::WebContents* web_contents = GetSenderWebContents(); -- if (!web_contents) { -- return RespondNow(ErrorWithArguments( -- api::webstore_private::GetReferrerChain::Results::Create(""), -- kWebstoreUserCancelledError)); -- } -- -- scoped_refptr -- navigation_observer_manager = g_browser_process->safe_browsing_service() -- ->navigation_observer_manager(); -- -- safe_browsing::ReferrerChain referrer_chain; -- SafeBrowsingNavigationObserverManager::AttributionResult result = -- navigation_observer_manager->IdentifyReferrerChainByWebContents( -- web_contents, kExtensionReferrerUserGestureLimit, &referrer_chain); -- -- // If the referrer chain is incomplete we'll append the most recent -- // navigations to referrer chain for diagnostic purposes. This only happens if -- // the user is not in incognito mode and has opted into extended reporting or -- // Scout reporting. Otherwise, |CountOfRecentNavigationsToAppend| returns 0. -- int recent_navigations_to_collect = -- SafeBrowsingNavigationObserverManager::CountOfRecentNavigationsToAppend( -- *profile, result); -- if (recent_navigations_to_collect > 0) { -- navigation_observer_manager->AppendRecentNavigations( -- recent_navigations_to_collect, &referrer_chain); -- } -- -- safe_browsing::ExtensionWebStoreInstallRequest request; -- request.mutable_referrer_chain()->Swap(&referrer_chain); -- request.mutable_referrer_chain_options()->set_recent_navigations_to_collect( -- recent_navigations_to_collect); -- -- std::string serialized_referrer_proto = request.SerializeAsString(); -- // Base64 encode the proto to avoid issues with base::Value rejecting strings -- // which are not valid UTF8. -- base::Base64Encode(serialized_referrer_proto, &serialized_referrer_proto); - return RespondNow( - ArgumentList(api::webstore_private::GetReferrerChain::Results::Create( -- serialized_referrer_proto))); -+ ""))); - } - - } // namespace extensions ---- a/chrome/browser/download/download_item_model.cc -+++ b/chrome/browser/download/download_item_model.cc -@@ -69,7 +69,7 @@ class DownloadItemModelData : public bas - - // Danger level of the file determined based on the file type and whether - // there was a user action associated with the download. -- DownloadFileType::DangerLevel danger_level_; -+ safe_browsing::DownloadFileType::DangerLevel danger_level_; - - // Whether the download is currently being revived. - bool is_being_revived_; -@@ -106,7 +106,7 @@ DownloadItemModelData::DownloadItemModel - : should_show_in_shelf_(true), - was_ui_notified_(false), - should_prefer_opening_in_browser_(false), -- danger_level_(DownloadFileType::NOT_DANGEROUS), -+ danger_level_(safe_browsing::DownloadFileType::NOT_DANGEROUS), - is_being_revived_(false) {} - - } // namespace -@@ -368,13 +368,13 @@ void DownloadItemModel::SetShouldPreferO - data->should_prefer_opening_in_browser_ = preference; - } - --DownloadFileType::DangerLevel DownloadItemModel::GetDangerLevel() const { -+safe_browsing::DownloadFileType::DangerLevel DownloadItemModel::GetDangerLevel() const { - const DownloadItemModelData* data = DownloadItemModelData::Get(download_); -- return data ? data->danger_level_ : DownloadFileType::NOT_DANGEROUS; -+ return data ? data->danger_level_ : safe_browsing::DownloadFileType::NOT_DANGEROUS; - } - - void DownloadItemModel::SetDangerLevel( -- DownloadFileType::DangerLevel danger_level) { -+ safe_browsing::DownloadFileType::DangerLevel danger_level) { - DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_); - data->danger_level_ = danger_level; - } -@@ -526,9 +526,6 @@ bool DownloadItemModel::IsCommandEnabled - // filename. Don't base an "Always open" decision based on it. Also - // exclude extensions. - return download_->CanOpenDownload() && -- safe_browsing::FileTypePolicies::GetInstance() -- ->IsAllowedToOpenAutomatically( -- download_->GetTargetFilePath()) && - !download_crx_util::IsExtensionDownload(*download_); - case DownloadCommands::PAUSE: - return !download_->IsSavePackageDownload() && ---- a/components/safe_browsing/features.cc -+++ b/components/safe_browsing/features.cc -@@ -43,10 +43,10 @@ const base::Feature kPasswordProtectionF - base::FEATURE_DISABLED_BY_DEFAULT}; - - const base::Feature kSuspiciousSiteTriggerQuotaFeature{ -- "SafeBrowsingSuspiciousSiteTriggerQuota", base::FEATURE_ENABLED_BY_DEFAULT}; -+ "SafeBrowsingSuspiciousSiteTriggerQuota", base::FEATURE_DISABLED_BY_DEFAULT}; - - const base::Feature kTelemetryForApkDownloads{ -- "SafeBrowsingTelemetryForApkDownloads", base::FEATURE_ENABLED_BY_DEFAULT}; -+ "SafeBrowsingTelemetryForApkDownloads", base::FEATURE_DISABLED_BY_DEFAULT}; - - const base::Feature kThreatDomDetailsTagAndAttributeFeature{ - "ThreatDomDetailsTagAttributes", base::FEATURE_DISABLED_BY_DEFAULT}; -@@ -59,7 +59,7 @@ const base::Feature kUseLocalBlacklistsV - base::FEATURE_DISABLED_BY_DEFAULT}; - - const base::Feature kInspectRarContentFeature{"InspectRarContent", -- base::FEATURE_ENABLED_BY_DEFAULT}; -+ base::FEATURE_DISABLED_BY_DEFAULT}; - - const base::Feature kUseAPDownloadProtection{"UseAPDownloadProtection", - base::FEATURE_DISABLED_BY_DEFAULT}; ---- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc -+++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc -@@ -52,37 +52,7 @@ SafeBrowsingPrivateGetReferrerChainFunct - base::StringPrintf("Could not find tab with id %d.", params->tab_id))); - } - -- Profile* profile = Profile::FromBrowserContext(browser_context()); -- if (!SafeBrowsingNavigationObserverManager::IsEnabledAndReady(profile)) -- return RespondNow(NoArguments()); -- -- scoped_refptr -- navigation_observer_manager = g_browser_process->safe_browsing_service() -- ->navigation_observer_manager(); -- -- safe_browsing::ReferrerChain referrer_chain; -- SafeBrowsingNavigationObserverManager::AttributionResult result = -- navigation_observer_manager->IdentifyReferrerChainByWebContents( -- contents, kReferrerUserGestureLimit, &referrer_chain); -- -- // If the referrer chain is incomplete we'll append the most recent -- // navigations to referrer chain for diagnostic purposes. This only happens if -- // the user is not in incognito mode and has opted into extended reporting or -- // Scout reporting. Otherwise, |CountOfRecentNavigationsToAppend| returns 0. -- int recent_navigations_to_collect = -- SafeBrowsingNavigationObserverManager::CountOfRecentNavigationsToAppend( -- *profile, result); -- if (recent_navigations_to_collect > 0) { -- navigation_observer_manager->AppendRecentNavigations( -- recent_navigations_to_collect, &referrer_chain); -- } -- - std::vector referrer_entries; -- referrer_entries.reserve(referrer_chain.size()); -- for (const auto& entry : referrer_chain) { -- referrer_entries.emplace_back( -- safe_browsing_util::ReferrerToReferrerChainEntry(entry)); -- } - return RespondNow(ArgumentList( - api::safe_browsing_private::GetReferrerChain::Results::Create( - referrer_entries))); diff --git a/testing/chromium/patches/0001-simd.patch b/testing/chromium/patches/0001-simd.patch deleted file mode 100644 index 0c75e9e3..00000000 --- a/testing/chromium/patches/0001-simd.patch +++ /dev/null @@ -1 +0,0 @@ -ZGlmZiAtLWdpdCBhL2NyYzMyLmMgYi9jcmMzMi5jCmluZGV4IDk1ODA0NDBjMGU2Yi4uOTE2MjQyOWNjN2I0IDEwMDY0NAotLS0gYS9jcmMzMi5jCisrKyBiL2NyYzMyLmMKQEAgLTI4LDYgKzI4LDggQEAKICMgIGVuZGlmIC8qICFEWU5BTUlDX0NSQ19UQUJMRSAqLwogI2VuZGlmIC8qIE1BS0VDUkNIICovCiAKKyNpbmNsdWRlICJkZWZsYXRlLmgiCisjaW5jbHVkZSAieDg2LmgiCiAjaW5jbHVkZSAienV0aWwuaCIgICAgICAvKiBmb3IgU1REQyBhbmQgRkFSIGRlZmluaXRpb25zICovCiAKIC8qIERlZmluaXRpb25zIGZvciBkb2luZyB0aGUgY3JjIGZvdXIgZGF0YSBieXRlcyBhdCBhIHRpbWUuICovCkBAIC00NDAsMyArNDQyLDI4IEBAIHVMb25nIFpFWFBPUlQgY3JjMzJfY29tYmluZTY0KGNyYzEsIGNyYzIsIGxlbjIpCiB7CiAgICAgcmV0dXJuIGNyYzMyX2NvbWJpbmVfKGNyYzEsIGNyYzIsIGxlbjIpOwogfQorCitaTElCX0lOVEVSTkFMIHZvaWQgY3JjX3Jlc2V0KGRlZmxhdGVfc3RhdGUgKmNvbnN0IHMpCit7CisgICAgaWYgKHg4Nl9jcHVfZW5hYmxlX3NpbWQpIHsKKyAgICAgICAgY3JjX2ZvbGRfaW5pdChzKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKyAgICBzLT5zdHJtLT5hZGxlciA9IGNyYzMyKDBMLCBaX05VTEwsIDApOworfQorCitaTElCX0lOVEVSTkFMIHZvaWQgY3JjX2ZpbmFsaXplKGRlZmxhdGVfc3RhdGUgKmNvbnN0IHMpCit7CisgICAgaWYgKHg4Nl9jcHVfZW5hYmxlX3NpbWQpCisgICAgICAgIHMtPnN0cm0tPmFkbGVyID0gY3JjX2ZvbGRfNTEydG8zMihzKTsKK30KKworWkxJQl9JTlRFUk5BTCB2b2lkIGNvcHlfd2l0aF9jcmMoel9zdHJlYW1wIHN0cm0sIEJ5dGVmICpkc3QsIGxvbmcgc2l6ZSkKK3sKKyAgICBpZiAoeDg2X2NwdV9lbmFibGVfc2ltZCkgeworICAgICAgICBjcmNfZm9sZF9jb3B5KHN0cm0tPnN0YXRlLCBkc3QsIHN0cm0tPm5leHRfaW4sIHNpemUpOworICAgICAgICByZXR1cm47CisgICAgfQorICAgIHptZW1jcHkoZHN0LCBzdHJtLT5uZXh0X2luLCBzaXplKTsKKyAgICBzdHJtLT5hZGxlciA9IGNyYzMyKHN0cm0tPmFkbGVyLCBkc3QsIHNpemUpOworfQpkaWZmIC0tZ2l0IGEvY3JjX2ZvbGRpbmcuYyBiL2NyY19mb2xkaW5nLmMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi40OGQ3Nzc0NGFhZjQKLS0tIC9kZXYvbnVsbAorKysgYi9jcmNfZm9sZGluZy5jCkBAIC0wLDAgKzEsNDkzIEBACisvKgorICogQ29tcHV0ZSB0aGUgQ1JDMzIgdXNpbmcgYSBwYXJhbGxlbGl6ZWQgZm9sZGluZyBhcHByb2FjaCB3aXRoIHRoZSBQQ0xNVUxRRFEKKyAqIGluc3RydWN0aW9uLgorICoKKyAqIEEgd2hpdGUgcGFwZXIgZGVzY3JpYmluZyB0aGlzIGFsZ29yaXRobSBjYW4gYmUgZm91bmQgYXQ6CisgKiBodHRwOi8vd3d3LmludGVsLmNvbS9jb250ZW50L2RhbS93d3cvcHVibGljL3VzL2VuL2RvY3VtZW50cy93aGl0ZS1wYXBlcnMvZmFzdC1jcmMtY29tcHV0YXRpb24tZ2VuZXJpYy1wb2x5bm9taWFscy1wY2xtdWxxZHEtcGFwZXIucGRmCisgKgorICogQ29weXJpZ2h0IChDKSAyMDEzIEludGVsIENvcnBvcmF0aW9uLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQXV0aG9yczoKKyAqIAlXYWpkaSBGZWdoYWxpICAgPHdhamRpLmsuZmVnaGFsaUBpbnRlbC5jb20+CisgKiAJSmltIEd1aWxmb3JkICAgIDxqYW1lcy5ndWlsZm9yZEBpbnRlbC5jb20+CisgKiAJVmlub2RoIEdvcGFsICAgIDx2aW5vZGguZ29wYWxAaW50ZWwuY29tPgorICogCUVyZGluYyBPenR1cmsgICA8ZXJkaW5jLm96dHVya0BpbnRlbC5jb20+CisgKiAJSmltIEt1a3VuYXMgICAgIDxqYW1lcy50Lmt1a3VuYXNAbGludXguaW50ZWwuY29tPgorICoKKyAqIEZvciBjb25kaXRpb25zIG9mIGRpc3RyaWJ1dGlvbiBhbmQgdXNlLCBzZWUgY29weXJpZ2h0IG5vdGljZSBpbiB6bGliLmgKKyAqLworCisjaW5jbHVkZSAiZGVmbGF0ZS5oIgorCisjaW5jbHVkZSA8aW50dHlwZXMuaD4KKyNpbmNsdWRlIDxlbW1pbnRyaW4uaD4KKyNpbmNsdWRlIDxpbW1pbnRyaW4uaD4KKyNpbmNsdWRlIDx3bW1pbnRyaW4uaD4KKworI2RlZmluZSBDUkNfTE9BRChzKSBcCisgICAgZG8geyBcCisgICAgICAgIF9fbTEyOGkgeG1tX2NyYzAgPSBfbW1fbG9hZHVfc2kxMjgoKF9fbTEyOGkgKilzLT5jcmMwICsgMCk7XAorICAgICAgICBfX20xMjhpIHhtbV9jcmMxID0gX21tX2xvYWR1X3NpMTI4KChfX20xMjhpICopcy0+Y3JjMCArIDEpO1wKKyAgICAgICAgX19tMTI4aSB4bW1fY3JjMiA9IF9tbV9sb2FkdV9zaTEyOCgoX19tMTI4aSAqKXMtPmNyYzAgKyAyKTtcCisgICAgICAgIF9fbTEyOGkgeG1tX2NyYzMgPSBfbW1fbG9hZHVfc2kxMjgoKF9fbTEyOGkgKilzLT5jcmMwICsgMyk7XAorICAgICAgICBfX20xMjhpIHhtbV9jcmNfcGFydCA9IF9tbV9sb2FkdV9zaTEyOCgoX19tMTI4aSAqKXMtPmNyYzAgKyA0KTsKKworI2RlZmluZSBDUkNfU0FWRShzKSBcCisgICAgICAgIF9tbV9zdG9yZXVfc2kxMjgoKF9fbTEyOGkgKilzLT5jcmMwICsgMCwgeG1tX2NyYzApO1wKKyAgICAgICAgX21tX3N0b3JldV9zaTEyOCgoX19tMTI4aSAqKXMtPmNyYzAgKyAxLCB4bW1fY3JjMSk7XAorICAgICAgICBfbW1fc3RvcmV1X3NpMTI4KChfX20xMjhpICopcy0+Y3JjMCArIDIsIHhtbV9jcmMyKTtcCisgICAgICAgIF9tbV9zdG9yZXVfc2kxMjgoKF9fbTEyOGkgKilzLT5jcmMwICsgMywgeG1tX2NyYzMpO1wKKyAgICAgICAgX21tX3N0b3JldV9zaTEyOCgoX19tMTI4aSAqKXMtPmNyYzAgKyA0LCB4bW1fY3JjX3BhcnQpO1wKKyAgICB9IHdoaWxlICgwKTsKKworWkxJQl9JTlRFUk5BTCB2b2lkIGNyY19mb2xkX2luaXQoZGVmbGF0ZV9zdGF0ZSAqY29uc3QgcykKK3sKKyAgICBDUkNfTE9BRChzKQorCisgICAgeG1tX2NyYzAgPSBfbW1fY3Z0c2kzMl9zaTEyOCgweDlkYjQyNDg3KTsKKyAgICB4bW1fY3JjMSA9IF9tbV9zZXR6ZXJvX3NpMTI4KCk7CisgICAgeG1tX2NyYzIgPSBfbW1fc2V0emVyb19zaTEyOCgpOworICAgIHhtbV9jcmMzID0gX21tX3NldHplcm9fc2kxMjgoKTsKKworICAgIENSQ19TQVZFKHMpCisKKyAgICBzLT5zdHJtLT5hZGxlciA9IDA7Cit9CisKK2xvY2FsIHZvaWQgZm9sZF8xKGRlZmxhdGVfc3RhdGUgKmNvbnN0IHMsCisgICAgICAgIF9fbTEyOGkgKnhtbV9jcmMwLCBfX20xMjhpICp4bW1fY3JjMSwKKyAgICAgICAgX19tMTI4aSAqeG1tX2NyYzIsIF9fbTEyOGkgKnhtbV9jcmMzKQoreworICAgIGNvbnN0IF9fbTEyOGkgeG1tX2ZvbGQ0ID0gX21tX3NldF9lcGkzMigKKyAgICAgICAgICAgIDB4MDAwMDAwMDEsIDB4NTQ0NDJiZDQsCisgICAgICAgICAgICAweDAwMDAwMDAxLCAweGM2ZTQxNTk2KTsKKworICAgIF9fbTEyOGkgeF90bXAzOworICAgIF9fbTEyOCBwc19jcmMwLCBwc19jcmMzLCBwc19yZXM7CisKKyAgICB4X3RtcDMgPSAqeG1tX2NyYzM7CisKKyAgICAqeG1tX2NyYzMgPSAqeG1tX2NyYzA7CisgICAgKnhtbV9jcmMwID0gX21tX2NsbXVsZXBpNjRfc2kxMjgoKnhtbV9jcmMwLCB4bW1fZm9sZDQsIDB4MDEpOworICAgICp4bW1fY3JjMyA9IF9tbV9jbG11bGVwaTY0X3NpMTI4KCp4bW1fY3JjMywgeG1tX2ZvbGQ0LCAweDEwKTsKKyAgICBwc19jcmMwID0gX21tX2Nhc3RzaTEyOF9wcygqeG1tX2NyYzApOworICAgIHBzX2NyYzMgPSBfbW1fY2FzdHNpMTI4X3BzKCp4bW1fY3JjMyk7CisgICAgcHNfcmVzID0gX21tX3hvcl9wcyhwc19jcmMwLCBwc19jcmMzKTsKKworICAgICp4bW1fY3JjMCA9ICp4bW1fY3JjMTsKKyAgICAqeG1tX2NyYzEgPSAqeG1tX2NyYzI7CisgICAgKnhtbV9jcmMyID0geF90bXAzOworICAgICp4bW1fY3JjMyA9IF9tbV9jYXN0cHNfc2kxMjgocHNfcmVzKTsKK30KKworbG9jYWwgdm9pZCBmb2xkXzIoZGVmbGF0ZV9zdGF0ZSAqY29uc3QgcywKKyAgICAgICAgX19tMTI4aSAqeG1tX2NyYzAsIF9fbTEyOGkgKnhtbV9jcmMxLAorICAgICAgICBfX20xMjhpICp4bW1fY3JjMiwgX19tMTI4aSAqeG1tX2NyYzMpCit7CisgICAgY29uc3QgX19tMTI4aSB4bW1fZm9sZDQgPSBfbW1fc2V0X2VwaTMyKAorICAgICAgICAgICAgMHgwMDAwMDAwMSwgMHg1NDQ0MmJkNCwKKyAgICAgICAgICAgIDB4MDAwMDAwMDEsIDB4YzZlNDE1OTYpOworCisgICAgX19tMTI4aSB4X3RtcDMsIHhfdG1wMjsKKyAgICBfX20xMjggcHNfY3JjMCwgcHNfY3JjMSwgcHNfY3JjMiwgcHNfY3JjMywgcHNfcmVzMzEsIHBzX3JlczIwOworCisgICAgeF90bXAzID0gKnhtbV9jcmMzOworICAgIHhfdG1wMiA9ICp4bW1fY3JjMjsKKworICAgICp4bW1fY3JjMyA9ICp4bW1fY3JjMTsKKyAgICAqeG1tX2NyYzEgPSBfbW1fY2xtdWxlcGk2NF9zaTEyOCgqeG1tX2NyYzEsIHhtbV9mb2xkNCwgMHgwMSk7CisgICAgKnhtbV9jcmMzID0gX21tX2NsbXVsZXBpNjRfc2kxMjgoKnhtbV9jcmMzLCB4bW1fZm9sZDQsIDB4MTApOworICAgIHBzX2NyYzMgPSBfbW1fY2FzdHNpMTI4X3BzKCp4bW1fY3JjMyk7CisgICAgcHNfY3JjMSA9IF9tbV9jYXN0c2kxMjhfcHMoKnhtbV9jcmMxKTsKKyAgICBwc19yZXMzMT0gX21tX3hvcl9wcyhwc19jcmMzLCBwc19jcmMxKTsKKworICAgICp4bW1fY3JjMiA9ICp4bW1fY3JjMDsKKyAgICAqeG1tX2NyYzAgPSBfbW1fY2xtdWxlcGk2NF9zaTEyOCgqeG1tX2NyYzAsIHhtbV9mb2xkNCwgMHgwMSk7CisgICAgKnhtbV9jcmMyID0gX21tX2NsbXVsZXBpNjRfc2kxMjgoKnhtbV9jcmMyLCB4bW1fZm9sZDQsIDB4MTApOworICAgIHBzX2NyYzAgPSBfbW1fY2FzdHNpMTI4X3BzKCp4bW1fY3JjMCk7CisgICAgcHNfY3JjMiA9IF9tbV9jYXN0c2kxMjhfcHMoKnhtbV9jcmMyKTsKKyAgICBwc19yZXMyMD0gX21tX3hvcl9wcyhwc19jcmMwLCBwc19jcmMyKTsKKworICAgICp4bW1fY3JjMCA9IHhfdG1wMjsKKyAgICAqeG1tX2NyYzEgPSB4X3RtcDM7CisgICAgKnhtbV9jcmMyID0gX21tX2Nhc3Rwc19zaTEyOChwc19yZXMyMCk7CisgICAgKnhtbV9jcmMzID0gX21tX2Nhc3Rwc19zaTEyOChwc19yZXMzMSk7Cit9CisKK2xvY2FsIHZvaWQgZm9sZF8zKGRlZmxhdGVfc3RhdGUgKmNvbnN0IHMsCisgICAgICAgIF9fbTEyOGkgKnhtbV9jcmMwLCBfX20xMjhpICp4bW1fY3JjMSwKKyAgICAgICAgX19tMTI4aSAqeG1tX2NyYzIsIF9fbTEyOGkgKnhtbV9jcmMzKQoreworICAgIGNvbnN0IF9fbTEyOGkgeG1tX2ZvbGQ0ID0gX21tX3NldF9lcGkzMigKKyAgICAgICAgICAgIDB4MDAwMDAwMDEsIDB4NTQ0NDJiZDQsCisgICAgICAgICAgICAweDAwMDAwMDAxLCAweGM2ZTQxNTk2KTsKKworICAgIF9fbTEyOGkgeF90bXAzOworICAgIF9fbTEyOCBwc19jcmMwLCBwc19jcmMxLCBwc19jcmMyLCBwc19jcmMzLCBwc19yZXMzMiwgcHNfcmVzMjEsIHBzX3JlczEwOworCisgICAgeF90bXAzID0gKnhtbV9jcmMzOworCisgICAgKnhtbV9jcmMzID0gKnhtbV9jcmMyOworICAgICp4bW1fY3JjMiA9IF9tbV9jbG11bGVwaTY0X3NpMTI4KCp4bW1fY3JjMiwgeG1tX2ZvbGQ0LCAweDAxKTsKKyAgICAqeG1tX2NyYzMgPSBfbW1fY2xtdWxlcGk2NF9zaTEyOCgqeG1tX2NyYzMsIHhtbV9mb2xkNCwgMHgxMCk7CisgICAgcHNfY3JjMiA9IF9tbV9jYXN0c2kxMjhfcHMoKnhtbV9jcmMyKTsKKyAgICBwc19jcmMzID0gX21tX2Nhc3RzaTEyOF9wcygqeG1tX2NyYzMpOworICAgIHBzX3JlczMyID0gX21tX3hvcl9wcyhwc19jcmMyLCBwc19jcmMzKTsKKworICAgICp4bW1fY3JjMiA9ICp4bW1fY3JjMTsKKyAgICAqeG1tX2NyYzEgPSBfbW1fY2xtdWxlcGk2NF9zaTEyOCgqeG1tX2NyYzEsIHhtbV9mb2xkNCwgMHgwMSk7CisgICAgKnhtbV9jcmMyID0gX21tX2NsbXVsZXBpNjRfc2kxMjgoKnhtbV9jcmMyLCB4bW1fZm9sZDQsIDB4MTApOworICAgIHBzX2NyYzEgPSBfbW1fY2FzdHNpMTI4X3BzKCp4bW1fY3JjMSk7CisgICAgcHNfY3JjMiA9IF9tbV9jYXN0c2kxMjhfcHMoKnhtbV9jcmMyKTsKKyAgICBwc19yZXMyMT0gX21tX3hvcl9wcyhwc19jcmMxLCBwc19jcmMyKTsKKworICAgICp4bW1fY3JjMSA9ICp4bW1fY3JjMDsKKyAgICAqeG1tX2NyYzAgPSBfbW1fY2xtdWxlcGk2NF9zaTEyOCgqeG1tX2NyYzAsIHhtbV9mb2xkNCwgMHgwMSk7CisgICAgKnhtbV9jcmMxID0gX21tX2NsbXVsZXBpNjRfc2kxMjgoKnhtbV9jcmMxLCB4bW1fZm9sZDQsIDB4MTApOworICAgIHBzX2NyYzAgPSBfbW1fY2FzdHNpMTI4X3BzKCp4bW1fY3JjMCk7CisgICAgcHNfY3JjMSA9IF9tbV9jYXN0c2kxMjhfcHMoKnhtbV9jcmMxKTsKKyAgICBwc19yZXMxMD0gX21tX3hvcl9wcyhwc19jcmMwLCBwc19jcmMxKTsKKworICAgICp4bW1fY3JjMCA9IHhfdG1wMzsKKyAgICAqeG1tX2NyYzEgPSBfbW1fY2FzdHBzX3NpMTI4KHBzX3JlczEwKTsKKyAgICAqeG1tX2NyYzIgPSBfbW1fY2FzdHBzX3NpMTI4KHBzX3JlczIxKTsKKyAgICAqeG1tX2NyYzMgPSBfbW1fY2FzdHBzX3NpMTI4KHBzX3JlczMyKTsKK30KKworbG9jYWwgdm9pZCBmb2xkXzQoZGVmbGF0ZV9zdGF0ZSAqY29uc3QgcywKKyAgICAgICAgX19tMTI4aSAqeG1tX2NyYzAsIF9fbTEyOGkgKnhtbV9jcmMxLAorICAgICAgICBfX20xMjhpICp4bW1fY3JjMiwgX19tMTI4aSAqeG1tX2NyYzMpCit7CisgICAgY29uc3QgX19tMTI4aSB4bW1fZm9sZDQgPSBfbW1fc2V0X2VwaTMyKAorICAgICAgICAgICAgMHgwMDAwMDAwMSwgMHg1NDQ0MmJkNCwKKyAgICAgICAgICAgIDB4MDAwMDAwMDEsIDB4YzZlNDE1OTYpOworCisgICAgX19tMTI4aSB4X3RtcDAsIHhfdG1wMSwgeF90bXAyLCB4X3RtcDM7CisgICAgX19tMTI4IHBzX2NyYzAsIHBzX2NyYzEsIHBzX2NyYzIsIHBzX2NyYzM7CisgICAgX19tMTI4IHBzX3QwLCBwc190MSwgcHNfdDIsIHBzX3QzOworICAgIF9fbTEyOCBwc19yZXMwLCBwc19yZXMxLCBwc19yZXMyLCBwc19yZXMzOworCisgICAgeF90bXAwID0gKnhtbV9jcmMwOworICAgIHhfdG1wMSA9ICp4bW1fY3JjMTsKKyAgICB4X3RtcDIgPSAqeG1tX2NyYzI7CisgICAgeF90bXAzID0gKnhtbV9jcmMzOworCisgICAgKnhtbV9jcmMwID0gX21tX2NsbXVsZXBpNjRfc2kxMjgoKnhtbV9jcmMwLCB4bW1fZm9sZDQsIDB4MDEpOworICAgIHhfdG1wMCA9IF9tbV9jbG11bGVwaTY0X3NpMTI4KHhfdG1wMCwgeG1tX2ZvbGQ0LCAweDEwKTsKKyAgICBwc19jcmMwID0gX21tX2Nhc3RzaTEyOF9wcygqeG1tX2NyYzApOworICAgIHBzX3QwID0gX21tX2Nhc3RzaTEyOF9wcyh4X3RtcDApOworICAgIHBzX3JlczAgPSBfbW1feG9yX3BzKHBzX2NyYzAsIHBzX3QwKTsKKworICAgICp4bW1fY3JjMSA9IF9tbV9jbG11bGVwaTY0X3NpMTI4KCp4bW1fY3JjMSwgeG1tX2ZvbGQ0LCAweDAxKTsKKyAgICB4X3RtcDEgPSBfbW1fY2xtdWxlcGk2NF9zaTEyOCh4X3RtcDEsIHhtbV9mb2xkNCwgMHgxMCk7CisgICAgcHNfY3JjMSA9IF9tbV9jYXN0c2kxMjhfcHMoKnhtbV9jcmMxKTsKKyAgICBwc190MSA9IF9tbV9jYXN0c2kxMjhfcHMoeF90bXAxKTsKKyAgICBwc19yZXMxID0gX21tX3hvcl9wcyhwc19jcmMxLCBwc190MSk7CisKKyAgICAqeG1tX2NyYzIgPSBfbW1fY2xtdWxlcGk2NF9zaTEyOCgqeG1tX2NyYzIsIHhtbV9mb2xkNCwgMHgwMSk7CisgICAgeF90bXAyID0gX21tX2NsbXVsZXBpNjRfc2kxMjgoeF90bXAyLCB4bW1fZm9sZDQsIDB4MTApOworICAgIHBzX2NyYzIgPSBfbW1fY2FzdHNpMTI4X3BzKCp4bW1fY3JjMik7CisgICAgcHNfdDIgPSBfbW1fY2FzdHNpMTI4X3BzKHhfdG1wMik7CisgICAgcHNfcmVzMiA9IF9tbV94b3JfcHMocHNfY3JjMiwgcHNfdDIpOworCisgICAgKnhtbV9jcmMzID0gX21tX2NsbXVsZXBpNjRfc2kxMjgoKnhtbV9jcmMzLCB4bW1fZm9sZDQsIDB4MDEpOworICAgIHhfdG1wMyA9IF9tbV9jbG11bGVwaTY0X3NpMTI4KHhfdG1wMywgeG1tX2ZvbGQ0LCAweDEwKTsKKyAgICBwc19jcmMzID0gX21tX2Nhc3RzaTEyOF9wcygqeG1tX2NyYzMpOworICAgIHBzX3QzID0gX21tX2Nhc3RzaTEyOF9wcyh4X3RtcDMpOworICAgIHBzX3JlczMgPSBfbW1feG9yX3BzKHBzX2NyYzMsIHBzX3QzKTsKKworICAgICp4bW1fY3JjMCA9IF9tbV9jYXN0cHNfc2kxMjgocHNfcmVzMCk7CisgICAgKnhtbV9jcmMxID0gX21tX2Nhc3Rwc19zaTEyOChwc19yZXMxKTsKKyAgICAqeG1tX2NyYzIgPSBfbW1fY2FzdHBzX3NpMTI4KHBzX3JlczIpOworICAgICp4bW1fY3JjMyA9IF9tbV9jYXN0cHNfc2kxMjgocHNfcmVzMyk7Cit9CisKK2xvY2FsIGNvbnN0IHVuc2lnbmVkIHphbGlnbigzMikgcHNodWZiX3NoZl90YWJsZVs2MF0gPSB7CisJMHg4NDgzODI4MSwweDg4ODc4Njg1LDB4OGM4YjhhODksMHgwMDhmOGU4ZCwgLyogc2hsIDE1ICgxNiAtIDEpL3NocjEgKi8KKwkweDg1ODQ4MzgyLDB4ODk4ODg3ODYsMHg4ZDhjOGI4YSwweDAxMDA4ZjhlLCAvKiBzaGwgMTQgKDE2IC0gMykvc2hyMiAqLworCTB4ODY4NTg0ODMsMHg4YTg5ODg4NywweDhlOGQ4YzhiLDB4MDIwMTAwOGYsIC8qIHNobCAxMyAoMTYgLSA0KS9zaHIzICovCisJMHg4Nzg2ODU4NCwweDhiOGE4OTg4LDB4OGY4ZThkOGMsMHgwMzAyMDEwMCwgLyogc2hsIDEyICgxNiAtIDQpL3NocjQgKi8KKwkweDg4ODc4Njg1LDB4OGM4YjhhODksMHgwMDhmOGU4ZCwweDA0MDMwMjAxLCAvKiBzaGwgMTEgKDE2IC0gNSkvc2hyNSAqLworCTB4ODk4ODg3ODYsMHg4ZDhjOGI4YSwweDAxMDA4ZjhlLDB4MDUwNDAzMDIsIC8qIHNobCAxMCAoMTYgLSA2KS9zaHI2ICovCisJMHg4YTg5ODg4NywweDhlOGQ4YzhiLDB4MDIwMTAwOGYsMHgwNjA1MDQwMywgLyogc2hsICA5ICgxNiAtIDcpL3NocjcgKi8KKwkweDhiOGE4OTg4LDB4OGY4ZThkOGMsMHgwMzAyMDEwMCwweDA3MDYwNTA0LCAvKiBzaGwgIDggKDE2IC0gOCkvc2hyOCAqLworCTB4OGM4YjhhODksMHgwMDhmOGU4ZCwweDA0MDMwMjAxLDB4MDgwNzA2MDUsIC8qIHNobCAgNyAoMTYgLSA5KS9zaHI5ICovCisJMHg4ZDhjOGI4YSwweDAxMDA4ZjhlLDB4MDUwNDAzMDIsMHgwOTA4MDcwNiwgLyogc2hsICA2ICgxNiAtMTApL3NocjEwKi8KKwkweDhlOGQ4YzhiLDB4MDIwMTAwOGYsMHgwNjA1MDQwMywweDBhMDkwODA3LCAvKiBzaGwgIDUgKDE2IC0xMSkvc2hyMTEqLworCTB4OGY4ZThkOGMsMHgwMzAyMDEwMCwweDA3MDYwNTA0LDB4MGIwYTA5MDgsIC8qIHNobCAgNCAoMTYgLTEyKS9zaHIxMiovCisJMHgwMDhmOGU4ZCwweDA0MDMwMjAxLDB4MDgwNzA2MDUsMHgwYzBiMGEwOSwgLyogc2hsICAzICgxNiAtMTMpL3NocjEzKi8KKwkweDAxMDA4ZjhlLDB4MDUwNDAzMDIsMHgwOTA4MDcwNiwweDBkMGMwYjBhLCAvKiBzaGwgIDIgKDE2IC0xNCkvc2hyMTQqLworCTB4MDIwMTAwOGYsMHgwNjA1MDQwMywweDBhMDkwODA3LDB4MGUwZDBjMGIgIC8qIHNobCAgMSAoMTYgLTE1KS9zaHIxNSovCit9OworCitsb2NhbCB2b2lkIHBhcnRpYWxfZm9sZChkZWZsYXRlX3N0YXRlICpjb25zdCBzLCBjb25zdCBzaXplX3QgbGVuLAorICAgICAgICBfX20xMjhpICp4bW1fY3JjMCwgX19tMTI4aSAqeG1tX2NyYzEsCisgICAgICAgIF9fbTEyOGkgKnhtbV9jcmMyLCBfX20xMjhpICp4bW1fY3JjMywKKyAgICAgICAgX19tMTI4aSAqeG1tX2NyY19wYXJ0KQoreworCisgICAgY29uc3QgX19tMTI4aSB4bW1fZm9sZDQgPSBfbW1fc2V0X2VwaTMyKAorICAgICAgICAgICAgMHgwMDAwMDAwMSwgMHg1NDQ0MmJkNCwKKyAgICAgICAgICAgIDB4MDAwMDAwMDEsIDB4YzZlNDE1OTYpOworICAgIGNvbnN0IF9fbTEyOGkgeG1tX21hc2szID0gX21tX3NldDFfZXBpMzIoMHg4MDgwODA4MCk7CisKKyAgICBfX20xMjhpIHhtbV9zaGwsIHhtbV9zaHIsIHhtbV90bXAxLCB4bW1fdG1wMiwgeG1tX3RtcDM7CisgICAgX19tMTI4aSB4bW1fYTBfMCwgeG1tX2EwXzE7CisgICAgX19tMTI4IHBzX2NyYzMsIHBzYTBfMCwgcHNhMF8xLCBwc19yZXM7CisKKyAgICB4bW1fc2hsID0gX21tX2xvYWRfc2kxMjgoKF9fbTEyOGkgKilwc2h1ZmJfc2hmX3RhYmxlICsgKGxlbiAtIDEpKTsKKyAgICB4bW1fc2hyID0geG1tX3NobDsKKyAgICB4bW1fc2hyID0gX21tX3hvcl9zaTEyOCh4bW1fc2hyLCB4bW1fbWFzazMpOworCisgICAgeG1tX2EwXzAgPSBfbW1fc2h1ZmZsZV9lcGk4KCp4bW1fY3JjMCwgeG1tX3NobCk7CisKKyAgICAqeG1tX2NyYzAgPSBfbW1fc2h1ZmZsZV9lcGk4KCp4bW1fY3JjMCwgeG1tX3Nocik7CisgICAgeG1tX3RtcDEgPSBfbW1fc2h1ZmZsZV9lcGk4KCp4bW1fY3JjMSwgeG1tX3NobCk7CisgICAgKnhtbV9jcmMwID0gX21tX29yX3NpMTI4KCp4bW1fY3JjMCwgeG1tX3RtcDEpOworCisgICAgKnhtbV9jcmMxID0gX21tX3NodWZmbGVfZXBpOCgqeG1tX2NyYzEsIHhtbV9zaHIpOworICAgIHhtbV90bXAyID0gX21tX3NodWZmbGVfZXBpOCgqeG1tX2NyYzIsIHhtbV9zaGwpOworICAgICp4bW1fY3JjMSA9IF9tbV9vcl9zaTEyOCgqeG1tX2NyYzEsIHhtbV90bXAyKTsKKworICAgICp4bW1fY3JjMiA9IF9tbV9zaHVmZmxlX2VwaTgoKnhtbV9jcmMyLCB4bW1fc2hyKTsKKyAgICB4bW1fdG1wMyA9IF9tbV9zaHVmZmxlX2VwaTgoKnhtbV9jcmMzLCB4bW1fc2hsKTsKKyAgICAqeG1tX2NyYzIgPSBfbW1fb3Jfc2kxMjgoKnhtbV9jcmMyLCB4bW1fdG1wMyk7CisKKyAgICAqeG1tX2NyYzMgPSBfbW1fc2h1ZmZsZV9lcGk4KCp4bW1fY3JjMywgeG1tX3Nocik7CisgICAgKnhtbV9jcmNfcGFydCA9IF9tbV9zaHVmZmxlX2VwaTgoKnhtbV9jcmNfcGFydCwgeG1tX3NobCk7CisgICAgKnhtbV9jcmMzID0gX21tX29yX3NpMTI4KCp4bW1fY3JjMywgKnhtbV9jcmNfcGFydCk7CisKKyAgICB4bW1fYTBfMSA9IF9tbV9jbG11bGVwaTY0X3NpMTI4KHhtbV9hMF8wLCB4bW1fZm9sZDQsIDB4MTApOworICAgIHhtbV9hMF8wID0gX21tX2NsbXVsZXBpNjRfc2kxMjgoeG1tX2EwXzAsIHhtbV9mb2xkNCwgMHgwMSk7CisKKyAgICBwc19jcmMzID0gX21tX2Nhc3RzaTEyOF9wcygqeG1tX2NyYzMpOworICAgIHBzYTBfMCA9IF9tbV9jYXN0c2kxMjhfcHMoeG1tX2EwXzApOworICAgIHBzYTBfMSA9IF9tbV9jYXN0c2kxMjhfcHMoeG1tX2EwXzEpOworCisgICAgcHNfcmVzID0gX21tX3hvcl9wcyhwc19jcmMzLCBwc2EwXzApOworICAgIHBzX3JlcyA9IF9tbV94b3JfcHMocHNfcmVzLCBwc2EwXzEpOworCisgICAgKnhtbV9jcmMzID0gX21tX2Nhc3Rwc19zaTEyOChwc19yZXMpOworfQorCitaTElCX0lOVEVSTkFMIHZvaWQgY3JjX2ZvbGRfY29weShkZWZsYXRlX3N0YXRlICpjb25zdCBzLAorICAgICAgICB1bnNpZ25lZCBjaGFyICpkc3QsIGNvbnN0IHVuc2lnbmVkIGNoYXIgKnNyYywgbG9uZyBsZW4pCit7CisgICAgdW5zaWduZWQgbG9uZyBhbGduX2RpZmY7CisgICAgX19tMTI4aSB4bW1fdDAsIHhtbV90MSwgeG1tX3QyLCB4bW1fdDM7CisKKyAgICBDUkNfTE9BRChzKQorCisgICAgaWYgKGxlbiA8IDE2KSB7CisgICAgICAgIGlmIChsZW4gPT0gMCkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgZ290byBwYXJ0aWFsOworICAgIH0KKworICAgIGFsZ25fZGlmZiA9IDAgLSAodWludHB0cl90KXNyYyAmIDB4RjsKKyAgICBpZiAoYWxnbl9kaWZmKSB7CisgICAgICAgIHhtbV9jcmNfcGFydCA9IF9tbV9sb2FkdV9zaTEyOCgoX19tMTI4aSAqKXNyYyk7CisgICAgICAgIF9tbV9zdG9yZXVfc2kxMjgoKF9fbTEyOGkgKilkc3QsIHhtbV9jcmNfcGFydCk7CisKKyAgICAgICAgZHN0ICs9IGFsZ25fZGlmZjsKKyAgICAgICAgc3JjICs9IGFsZ25fZGlmZjsKKyAgICAgICAgbGVuIC09IGFsZ25fZGlmZjsKKworICAgICAgICBwYXJ0aWFsX2ZvbGQocywgYWxnbl9kaWZmLCAmeG1tX2NyYzAsICZ4bW1fY3JjMSwgJnhtbV9jcmMyLCAmeG1tX2NyYzMsCisgICAgICAgICAgICAmeG1tX2NyY19wYXJ0KTsKKyAgICB9CisKKyAgICB3aGlsZSAoKGxlbiAtPSA2NCkgPj0gMCkgeworICAgICAgICB4bW1fdDAgPSBfbW1fbG9hZF9zaTEyOCgoX19tMTI4aSAqKXNyYyk7CisgICAgICAgIHhtbV90MSA9IF9tbV9sb2FkX3NpMTI4KChfX20xMjhpICopc3JjICsgMSk7CisgICAgICAgIHhtbV90MiA9IF9tbV9sb2FkX3NpMTI4KChfX20xMjhpICopc3JjICsgMik7CisgICAgICAgIHhtbV90MyA9IF9tbV9sb2FkX3NpMTI4KChfX20xMjhpICopc3JjICsgMyk7CisKKyAgICAgICAgZm9sZF80KHMsICZ4bW1fY3JjMCwgJnhtbV9jcmMxLCAmeG1tX2NyYzIsICZ4bW1fY3JjMyk7CisKKyAgICAgICAgX21tX3N0b3JldV9zaTEyOCgoX19tMTI4aSAqKWRzdCwgeG1tX3QwKTsKKyAgICAgICAgX21tX3N0b3JldV9zaTEyOCgoX19tMTI4aSAqKWRzdCArIDEsIHhtbV90MSk7CisgICAgICAgIF9tbV9zdG9yZXVfc2kxMjgoKF9fbTEyOGkgKilkc3QgKyAyLCB4bW1fdDIpOworICAgICAgICBfbW1fc3RvcmV1X3NpMTI4KChfX20xMjhpICopZHN0ICsgMywgeG1tX3QzKTsKKworICAgICAgICB4bW1fY3JjMCA9IF9tbV94b3Jfc2kxMjgoeG1tX2NyYzAsIHhtbV90MCk7CisgICAgICAgIHhtbV9jcmMxID0gX21tX3hvcl9zaTEyOCh4bW1fY3JjMSwgeG1tX3QxKTsKKyAgICAgICAgeG1tX2NyYzIgPSBfbW1feG9yX3NpMTI4KHhtbV9jcmMyLCB4bW1fdDIpOworICAgICAgICB4bW1fY3JjMyA9IF9tbV94b3Jfc2kxMjgoeG1tX2NyYzMsIHhtbV90Myk7CisKKyAgICAgICAgc3JjICs9IDY0OworICAgICAgICBkc3QgKz0gNjQ7CisgICAgfQorCisgICAgLyoKKyAgICAgKiBsZW4gPSBudW0gYnl0ZXMgbGVmdCAtIDY0CisgICAgICovCisgICAgaWYgKGxlbiArIDE2ID49IDApIHsKKyAgICAgICAgbGVuICs9IDE2OworCisgICAgICAgIHhtbV90MCA9IF9tbV9sb2FkX3NpMTI4KChfX20xMjhpICopc3JjKTsKKyAgICAgICAgeG1tX3QxID0gX21tX2xvYWRfc2kxMjgoKF9fbTEyOGkgKilzcmMgKyAxKTsKKyAgICAgICAgeG1tX3QyID0gX21tX2xvYWRfc2kxMjgoKF9fbTEyOGkgKilzcmMgKyAyKTsKKworICAgICAgICBmb2xkXzMocywgJnhtbV9jcmMwLCAmeG1tX2NyYzEsICZ4bW1fY3JjMiwgJnhtbV9jcmMzKTsKKworICAgICAgICBfbW1fc3RvcmV1X3NpMTI4KChfX20xMjhpICopZHN0LCB4bW1fdDApOworICAgICAgICBfbW1fc3RvcmV1X3NpMTI4KChfX20xMjhpICopZHN0ICsgMSwgeG1tX3QxKTsKKyAgICAgICAgX21tX3N0b3JldV9zaTEyOCgoX19tMTI4aSAqKWRzdCArIDIsIHhtbV90Mik7CisKKyAgICAgICAgeG1tX2NyYzEgPSBfbW1feG9yX3NpMTI4KHhtbV9jcmMxLCB4bW1fdDApOworICAgICAgICB4bW1fY3JjMiA9IF9tbV94b3Jfc2kxMjgoeG1tX2NyYzIsIHhtbV90MSk7CisgICAgICAgIHhtbV9jcmMzID0gX21tX3hvcl9zaTEyOCh4bW1fY3JjMywgeG1tX3QyKTsKKworICAgICAgICBpZiAobGVuID09IDApCisgICAgICAgICAgICBnb3RvIGRvbmU7CisKKyAgICAgICAgZHN0ICs9IDQ4OworICAgICAgICBzcmMgKz0gNDg7CisgICAgfSBlbHNlIGlmIChsZW4gKyAzMiA+PSAwKSB7CisgICAgICAgIGxlbiArPSAzMjsKKworICAgICAgICB4bW1fdDAgPSBfbW1fbG9hZF9zaTEyOCgoX19tMTI4aSAqKXNyYyk7CisgICAgICAgIHhtbV90MSA9IF9tbV9sb2FkX3NpMTI4KChfX20xMjhpICopc3JjICsgMSk7CisKKyAgICAgICAgZm9sZF8yKHMsICZ4bW1fY3JjMCwgJnhtbV9jcmMxLCAmeG1tX2NyYzIsICZ4bW1fY3JjMyk7CisKKyAgICAgICAgX21tX3N0b3JldV9zaTEyOCgoX19tMTI4aSAqKWRzdCwgeG1tX3QwKTsKKyAgICAgICAgX21tX3N0b3JldV9zaTEyOCgoX19tMTI4aSAqKWRzdCArIDEsIHhtbV90MSk7CisKKyAgICAgICAgeG1tX2NyYzIgPSBfbW1feG9yX3NpMTI4KHhtbV9jcmMyLCB4bW1fdDApOworICAgICAgICB4bW1fY3JjMyA9IF9tbV94b3Jfc2kxMjgoeG1tX2NyYzMsIHhtbV90MSk7CisKKyAgICAgICAgaWYgKGxlbiA9PSAwKQorICAgICAgICAgICAgZ290byBkb25lOworCisgICAgICAgIGRzdCArPSAzMjsKKyAgICAgICAgc3JjICs9IDMyOworICAgIH0gZWxzZSBpZiAobGVuICsgNDggPj0gMCkgeworICAgICAgICBsZW4gKz0gNDg7CisKKyAgICAgICAgeG1tX3QwID0gX21tX2xvYWRfc2kxMjgoKF9fbTEyOGkgKilzcmMpOworCisgICAgICAgIGZvbGRfMShzLCAmeG1tX2NyYzAsICZ4bW1fY3JjMSwgJnhtbV9jcmMyLCAmeG1tX2NyYzMpOworCisgICAgICAgIF9tbV9zdG9yZXVfc2kxMjgoKF9fbTEyOGkgKilkc3QsIHhtbV90MCk7CisKKyAgICAgICAgeG1tX2NyYzMgPSBfbW1feG9yX3NpMTI4KHhtbV9jcmMzLCB4bW1fdDApOworCisgICAgICAgIGlmIChsZW4gPT0gMCkKKyAgICAgICAgICAgIGdvdG8gZG9uZTsKKworICAgICAgICBkc3QgKz0gMTY7CisgICAgICAgIHNyYyArPSAxNjsKKyAgICB9IGVsc2UgeworICAgICAgICBsZW4gKz0gNjQ7CisgICAgICAgIGlmIChsZW4gPT0gMCkKKyAgICAgICAgICAgIGdvdG8gZG9uZTsKKyAgICB9CisKK3BhcnRpYWw6CisKKyNpZiBkZWZpbmVkKF9NU0NfVkVSKQorICAgIC8qIFZTIGRvZXMgbm90IHBlcm1pdCB0aGUgdXNlIG9mIF9tbV9zZXRfZXBpNjR4IGluIDMyLWJpdCBidWlsZHMgKi8KKyAgICB7CisgICAgICAgIGludDMyX3QgcGFydHNbNF0gPSB7MCwgMCwgMCwgMH07CisgICAgICAgIG1lbWNweSgmcGFydHMsIHNyYywgbGVuKTsKKyAgICAgICAgeG1tX2NyY19wYXJ0ID0gX21tX3NldF9lcGkzMihwYXJ0c1szXSwgcGFydHNbMl0sIHBhcnRzWzFdLCBwYXJ0c1swXSk7CisgICAgfQorI2Vsc2UKKyAgICB7CisgICAgICAgIGludDY0X3QgcGFydHNbMl0gPSB7MCwgMH07CisgICAgICAgIG1lbWNweSgmcGFydHMsIHNyYywgbGVuKTsKKyAgICAgICAgeG1tX2NyY19wYXJ0ID0gX21tX3NldF9lcGk2NHgocGFydHNbMV0sIHBhcnRzWzBdKTsKKyAgICB9CisjZW5kaWYKKworICAgIF9tbV9zdG9yZXVfc2kxMjgoKF9fbTEyOGkgKilkc3QsIHhtbV9jcmNfcGFydCk7CisgICAgcGFydGlhbF9mb2xkKHMsIGxlbiwgJnhtbV9jcmMwLCAmeG1tX2NyYzEsICZ4bW1fY3JjMiwgJnhtbV9jcmMzLAorICAgICAgICAmeG1tX2NyY19wYXJ0KTsKK2RvbmU6CisgICAgQ1JDX1NBVkUocykKK30KKworbG9jYWwgY29uc3QgdW5zaWduZWQgemFsaWduKDE2KSBjcmNfa1tdID0geworICAgIDB4Y2NhYTAwOWUsIDB4MDAwMDAwMDAsIC8qIHJrMSAqLworICAgIDB4NzUxOTk3ZDAsIDB4MDAwMDAwMDEsIC8qIHJrMiAqLworICAgIDB4Y2NhYTAwOWUsIDB4MDAwMDAwMDAsIC8qIHJrNSAqLworICAgIDB4NjNjZDYxMjQsIDB4MDAwMDAwMDEsIC8qIHJrNiAqLworICAgIDB4ZjcwMTE2NDAsIDB4MDAwMDAwMDEsIC8qIHJrNyAqLworICAgIDB4ZGI3MTA2NDAsIDB4MDAwMDAwMDEgIC8qIHJrOCAqLworfTsKKworbG9jYWwgY29uc3QgdW5zaWduZWQgemFsaWduKDE2KSBjcmNfbWFza1s0XSA9IHsKKyAgICAweEZGRkZGRkZGLCAweEZGRkZGRkZGLCAweDAwMDAwMDAwLCAweDAwMDAwMDAwCit9OworCitsb2NhbCBjb25zdCB1bnNpZ25lZCB6YWxpZ24oMTYpIGNyY19tYXNrMls0XSA9IHsKKyAgICAweDAwMDAwMDAwLCAweEZGRkZGRkZGLCAweEZGRkZGRkZGLCAweEZGRkZGRkZGCit9OworCit1bnNpZ25lZCBaTElCX0lOVEVSTkFMIGNyY19mb2xkXzUxMnRvMzIoZGVmbGF0ZV9zdGF0ZSAqY29uc3QgcykKK3sKKyAgICBjb25zdCBfX20xMjhpIHhtbV9tYXNrICA9IF9tbV9sb2FkX3NpMTI4KChfX20xMjhpICopY3JjX21hc2spOworICAgIGNvbnN0IF9fbTEyOGkgeG1tX21hc2syID0gX21tX2xvYWRfc2kxMjgoKF9fbTEyOGkgKiljcmNfbWFzazIpOworCisgICAgdW5zaWduZWQgY3JjOworICAgIF9fbTEyOGkgeF90bXAwLCB4X3RtcDEsIHhfdG1wMiwgY3JjX2ZvbGQ7CisKKyAgICBDUkNfTE9BRChzKQorCisgICAgLyoKKyAgICAgKiBrMQorICAgICAqLworICAgIGNyY19mb2xkID0gX21tX2xvYWRfc2kxMjgoKF9fbTEyOGkgKiljcmNfayk7CisKKyAgICB4X3RtcDAgPSBfbW1fY2xtdWxlcGk2NF9zaTEyOCh4bW1fY3JjMCwgY3JjX2ZvbGQsIDB4MTApOworICAgIHhtbV9jcmMwID0gX21tX2NsbXVsZXBpNjRfc2kxMjgoeG1tX2NyYzAsIGNyY19mb2xkLCAweDAxKTsKKyAgICB4bW1fY3JjMSA9IF9tbV94b3Jfc2kxMjgoeG1tX2NyYzEsIHhfdG1wMCk7CisgICAgeG1tX2NyYzEgPSBfbW1feG9yX3NpMTI4KHhtbV9jcmMxLCB4bW1fY3JjMCk7CisKKyAgICB4X3RtcDEgPSBfbW1fY2xtdWxlcGk2NF9zaTEyOCh4bW1fY3JjMSwgY3JjX2ZvbGQsIDB4MTApOworICAgIHhtbV9jcmMxID0gX21tX2NsbXVsZXBpNjRfc2kxMjgoeG1tX2NyYzEsIGNyY19mb2xkLCAweDAxKTsKKyAgICB4bW1fY3JjMiA9IF9tbV94b3Jfc2kxMjgoeG1tX2NyYzIsIHhfdG1wMSk7CisgICAgeG1tX2NyYzIgPSBfbW1feG9yX3NpMTI4KHhtbV9jcmMyLCB4bW1fY3JjMSk7CisKKyAgICB4X3RtcDIgPSBfbW1fY2xtdWxlcGk2NF9zaTEyOCh4bW1fY3JjMiwgY3JjX2ZvbGQsIDB4MTApOworICAgIHhtbV9jcmMyID0gX21tX2NsbXVsZXBpNjRfc2kxMjgoeG1tX2NyYzIsIGNyY19mb2xkLCAweDAxKTsKKyAgICB4bW1fY3JjMyA9IF9tbV94b3Jfc2kxMjgoeG1tX2NyYzMsIHhfdG1wMik7CisgICAgeG1tX2NyYzMgPSBfbW1feG9yX3NpMTI4KHhtbV9jcmMzLCB4bW1fY3JjMik7CisKKyAgICAvKgorICAgICAqIGs1CisgICAgICovCisgICAgY3JjX2ZvbGQgPSBfbW1fbG9hZF9zaTEyOCgoX19tMTI4aSAqKWNyY19rICsgMSk7CisKKyAgICB4bW1fY3JjMCA9IHhtbV9jcmMzOworICAgIHhtbV9jcmMzID0gX21tX2NsbXVsZXBpNjRfc2kxMjgoeG1tX2NyYzMsIGNyY19mb2xkLCAwKTsKKyAgICB4bW1fY3JjMCA9IF9tbV9zcmxpX3NpMTI4KHhtbV9jcmMwLCA4KTsKKyAgICB4bW1fY3JjMyA9IF9tbV94b3Jfc2kxMjgoeG1tX2NyYzMsIHhtbV9jcmMwKTsKKworICAgIHhtbV9jcmMwID0geG1tX2NyYzM7CisgICAgeG1tX2NyYzMgPSBfbW1fc2xsaV9zaTEyOCh4bW1fY3JjMywgNCk7CisgICAgeG1tX2NyYzMgPSBfbW1fY2xtdWxlcGk2NF9zaTEyOCh4bW1fY3JjMywgY3JjX2ZvbGQsIDB4MTApOworICAgIHhtbV9jcmMzID0gX21tX3hvcl9zaTEyOCh4bW1fY3JjMywgeG1tX2NyYzApOworICAgIHhtbV9jcmMzID0gX21tX2FuZF9zaTEyOCh4bW1fY3JjMywgeG1tX21hc2syKTsKKworICAgIC8qCisgICAgICogazcKKyAgICAgKi8KKyAgICB4bW1fY3JjMSA9IHhtbV9jcmMzOworICAgIHhtbV9jcmMyID0geG1tX2NyYzM7CisgICAgY3JjX2ZvbGQgPSBfbW1fbG9hZF9zaTEyOCgoX19tMTI4aSAqKWNyY19rICsgMik7CisKKyAgICB4bW1fY3JjMyA9IF9tbV9jbG11bGVwaTY0X3NpMTI4KHhtbV9jcmMzLCBjcmNfZm9sZCwgMCk7CisgICAgeG1tX2NyYzMgPSBfbW1feG9yX3NpMTI4KHhtbV9jcmMzLCB4bW1fY3JjMik7CisgICAgeG1tX2NyYzMgPSBfbW1fYW5kX3NpMTI4KHhtbV9jcmMzLCB4bW1fbWFzayk7CisKKyAgICB4bW1fY3JjMiA9IHhtbV9jcmMzOworICAgIHhtbV9jcmMzID0gX21tX2NsbXVsZXBpNjRfc2kxMjgoeG1tX2NyYzMsIGNyY19mb2xkLCAweDEwKTsKKyAgICB4bW1fY3JjMyA9IF9tbV94b3Jfc2kxMjgoeG1tX2NyYzMsIHhtbV9jcmMyKTsKKyAgICB4bW1fY3JjMyA9IF9tbV94b3Jfc2kxMjgoeG1tX2NyYzMsIHhtbV9jcmMxKTsKKworICAgIGNyYyA9IF9tbV9leHRyYWN0X2VwaTMyKHhtbV9jcmMzLCAyKTsKKyAgICByZXR1cm4gfmNyYzsKKyAgICBDUkNfU0FWRShzKQorfQpkaWZmIC0tZ2l0IGEvZGVmbGF0ZS5jIGIvZGVmbGF0ZS5jCmluZGV4IDFlYzc2MTQ0OGRlOS4uYWEwYzljNjdhNmRjIDEwMDY0NAotLS0gYS9kZWZsYXRlLmMKKysrIGIvZGVmbGF0ZS5jCkBAIC00OCw4ICs0OCw5IEBACiAgKi8KIAogLyogQCgjKSAkSWQkICovCi0KKyNpbmNsdWRlIDxhc3NlcnQuaD4KICNpbmNsdWRlICJkZWZsYXRlLmgiCisjaW5jbHVkZSAieDg2LmgiCiAKIGNvbnN0IGNoYXIgZGVmbGF0ZV9jb3B5cmlnaHRbXSA9CiAgICAiIGRlZmxhdGUgMS4yLjExIENvcHlyaWdodCAxOTk1LTIwMTcgSmVhbi1sb3VwIEdhaWxseSBhbmQgTWFyayBBZGxlciAiOwpAQCAtODYsNyArODcsNyBAQCBsb2NhbCBibG9ja19zdGF0ZSBkZWZsYXRlX2h1ZmYgICBPRigoZGVmbGF0ZV9zdGF0ZSAqcywgaW50IGZsdXNoKSk7CiBsb2NhbCB2b2lkIGxtX2luaXQgICAgICAgIE9GKChkZWZsYXRlX3N0YXRlICpzKSk7CiBsb2NhbCB2b2lkIHB1dFNob3J0TVNCICAgIE9GKChkZWZsYXRlX3N0YXRlICpzLCB1SW50IGIpKTsKIGxvY2FsIHZvaWQgZmx1c2hfcGVuZGluZyAgT0YoKHpfc3RyZWFtcCBzdHJtKSk7Ci1sb2NhbCB1bnNpZ25lZCByZWFkX2J1ZiAgIE9GKCh6X3N0cmVhbXAgc3RybSwgQnl0ZWYgKmJ1ZiwgdW5zaWduZWQgc2l6ZSkpOwordW5zaWduZWQgWkxJQl9JTlRFUk5BTCBkZWZsYXRlX3JlYWRfYnVmIE9GKCh6X3N0cmVhbXAgc3RybSwgQnl0ZWYgKmJ1ZiwgdW5zaWduZWQgc2l6ZSkpOwogI2lmZGVmIEFTTVYKICMgIHByYWdtYSBtZXNzYWdlKCJBc3NlbWJsZXIgY29kZSBtYXkgaGF2ZSBidWdzIC0tIHVzZSBhdCB5b3VyIG93biByaXNrIikKICAgICAgIHZvaWQgbWF0Y2hfaW5pdCBPRigodm9pZCkpOyAvKiBhc20gY29kZSBpbml0aWFsaXphdGlvbiAqLwpAQCAtMTAwLDYgKzEwMSwyMCBAQCBsb2NhbCAgdm9pZCBjaGVja19tYXRjaCBPRigoZGVmbGF0ZV9zdGF0ZSAqcywgSVBvcyBzdGFydCwgSVBvcyBtYXRjaCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgbGVuZ3RoKSk7CiAjZW5kaWYKIAorLyogRnJvbSBjcmMzMi5jICovCitleHRlcm4gdm9pZCBaTElCX0lOVEVSTkFMIGNyY19yZXNldChkZWZsYXRlX3N0YXRlICpjb25zdCBzKTsKK2V4dGVybiB2b2lkIFpMSUJfSU5URVJOQUwgY3JjX2ZpbmFsaXplKGRlZmxhdGVfc3RhdGUgKmNvbnN0IHMpOworZXh0ZXJuIHZvaWQgWkxJQl9JTlRFUk5BTCBjb3B5X3dpdGhfY3JjKHpfc3RyZWFtcCBzdHJtLCBCeXRlZiAqZHN0LCBsb25nIHNpemUpOworCisjaWZkZWYgX01TQ19WRVIKKyNkZWZpbmUgSU5MSU5FIF9faW5saW5lCisjZWxzZQorI2RlZmluZSBJTkxJTkUgaW5saW5lCisjZW5kaWYKKworLyogSW5saW5lIG9wdGltaXNhdGlvbiAqLworbG9jYWwgSU5MSU5FIFBvcyBpbnNlcnRfc3RyaW5nX3NzZShkZWZsYXRlX3N0YXRlICpjb25zdCBzLCBjb25zdCBQb3Mgc3RyKTsKKwogLyogPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CiAgKiBMb2NhbCBkYXRhCiAgKi8KQEAgLTE2Miw3ICsxNzcsNiBAQCBsb2NhbCBjb25zdCBjb25maWcgY29uZmlndXJhdGlvbl90YWJsZVsxMF0gPSB7CiAgKi8KICNkZWZpbmUgVVBEQVRFX0hBU0gocyxoLGMpIChoID0gKCgoaCk8PHMtPmhhc2hfc2hpZnQpIF4gKGMpKSAmIHMtPmhhc2hfbWFzaykKIAotCiAvKiA9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KICAqIEluc2VydCBzdHJpbmcgc3RyIGluIHRoZSBkaWN0aW9uYXJ5IGFuZCBzZXQgbWF0Y2hfaGVhZCB0byB0aGUgcHJldmlvdXMgaGVhZAogICogb2YgdGhlIGhhc2ggY2hhaW4gKHRoZSBtb3N0IHJlY2VudCBzdHJpbmcgd2l0aCBzYW1lIGhhc2gga2V5KS4gUmV0dXJuCkBAIC0xNzMsMTcgKzE4NywyOCBAQCBsb2NhbCBjb25zdCBjb25maWcgY29uZmlndXJhdGlvbl90YWJsZVsxMF0gPSB7CiAgKiAgICBjaGFyYWN0ZXJzIGFuZCB0aGUgZmlyc3QgTUlOX01BVENIIGJ5dGVzIG9mIHN0ciBhcmUgdmFsaWQgKGV4Y2VwdCBmb3IKICAqICAgIHRoZSBsYXN0IE1JTl9NQVRDSC0xIGJ5dGVzIG9mIHRoZSBpbnB1dCBmaWxlKS4KICAqLworbG9jYWwgSU5MSU5FIFBvcyBpbnNlcnRfc3RyaW5nX2MoZGVmbGF0ZV9zdGF0ZSAqY29uc3QgcywgY29uc3QgUG9zIHN0cikKK3sKKyAgICBQb3MgcmV0OworCisgICAgVVBEQVRFX0hBU0gocywgcy0+aW5zX2gsIHMtPndpbmRvd1soc3RyKSArIChNSU5fTUFUQ0gtMSldKTsKICNpZmRlZiBGQVNURVNUCi0jZGVmaW5lIElOU0VSVF9TVFJJTkcocywgc3RyLCBtYXRjaF9oZWFkKSBcCi0gICAoVVBEQVRFX0hBU0gocywgcy0+aW5zX2gsIHMtPndpbmRvd1soc3RyKSArIChNSU5fTUFUQ0gtMSldKSwgXAotICAgIG1hdGNoX2hlYWQgPSBzLT5oZWFkW3MtPmluc19oXSwgXAotICAgIHMtPmhlYWRbcy0+aW5zX2hdID0gKFBvcykoc3RyKSkKKyAgICByZXQgPSBzLT5oZWFkW3MtPmluc19oXTsKICNlbHNlCi0jZGVmaW5lIElOU0VSVF9TVFJJTkcocywgc3RyLCBtYXRjaF9oZWFkKSBcCi0gICAoVVBEQVRFX0hBU0gocywgcy0+aW5zX2gsIHMtPndpbmRvd1soc3RyKSArIChNSU5fTUFUQ0gtMSldKSwgXAotICAgIG1hdGNoX2hlYWQgPSBzLT5wcmV2WyhzdHIpICYgcy0+d19tYXNrXSA9IHMtPmhlYWRbcy0+aW5zX2hdLCBcCi0gICAgcy0+aGVhZFtzLT5pbnNfaF0gPSAoUG9zKShzdHIpKQorICAgIHJldCA9IHMtPnByZXZbc3RyICYgcy0+d19tYXNrXSA9IHMtPmhlYWRbcy0+aW5zX2hdOwogI2VuZGlmCisgICAgcy0+aGVhZFtzLT5pbnNfaF0gPSBzdHI7CisKKyAgICByZXR1cm4gcmV0OworfQorCitsb2NhbCBJTkxJTkUgUG9zIGluc2VydF9zdHJpbmcoZGVmbGF0ZV9zdGF0ZSAqY29uc3QgcywgY29uc3QgUG9zIHN0cikKK3sKKyAgICBpZiAoeDg2X2NwdV9lbmFibGVfc2ltZCkKKyAgICAgICAgcmV0dXJuIGluc2VydF9zdHJpbmdfc3NlKHMsIHN0cik7CisgICAgcmV0dXJuIGluc2VydF9zdHJpbmdfYyhzLCBzdHIpOworfQorCiAKIC8qID09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQogICogSW5pdGlhbGl6ZSB0aGUgaGFzaCB0YWJsZSAoYXZvaWRpbmcgNjRLIG92ZXJmbG93IGZvciAxNiBiaXQgc3lzdGVtcykuCkBAIC0yNDgsNiArMjczLDcgQEAgaW50IFpFWFBPUlQgZGVmbGF0ZUluaXQyXyhzdHJtLCBsZXZlbCwgbWV0aG9kLCB3aW5kb3dCaXRzLCBtZW1MZXZlbCwgc3RyYXRlZ3ksCiAgICAgY29uc3QgY2hhciAqdmVyc2lvbjsKICAgICBpbnQgc3RyZWFtX3NpemU7CiB7CisgICAgdW5zaWduZWQgd2luZG93X3BhZGRpbmcgPSA4OwogICAgIGRlZmxhdGVfc3RhdGUgKnM7CiAgICAgaW50IHdyYXAgPSAxOwogICAgIHN0YXRpYyBjb25zdCBjaGFyIG15X3ZlcnNpb25bXSA9IFpMSUJfVkVSU0lPTjsKQEAgLTI1Nyw2ICsyODMsOCBAQCBpbnQgWkVYUE9SVCBkZWZsYXRlSW5pdDJfKHN0cm0sIGxldmVsLCBtZXRob2QsIHdpbmRvd0JpdHMsIG1lbUxldmVsLCBzdHJhdGVneSwKICAgICAgKiBvdXRwdXQgc2l6ZSBmb3IgKGxlbmd0aCxkaXN0YW5jZSkgY29kZXMgaXMgPD0gMjQgYml0cy4KICAgICAgKi8KIAorICAgIHg4Nl9jaGVja19mZWF0dXJlcygpOworCiAgICAgaWYgKHZlcnNpb24gPT0gWl9OVUxMIHx8IHZlcnNpb25bMF0gIT0gbXlfdmVyc2lvblswXSB8fAogICAgICAgICBzdHJlYW1fc2l6ZSAhPSBzaXplb2Yoel9zdHJlYW0pKSB7CiAgICAgICAgIHJldHVybiBaX1ZFUlNJT05fRVJST1I7CkBAIC0zMTMsMTIgKzM0MSwxOSBAQCBpbnQgWkVYUE9SVCBkZWZsYXRlSW5pdDJfKHN0cm0sIGxldmVsLCBtZXRob2QsIHdpbmRvd0JpdHMsIG1lbUxldmVsLCBzdHJhdGVneSwKICAgICBzLT53X3NpemUgPSAxIDw8IHMtPndfYml0czsKICAgICBzLT53X21hc2sgPSBzLT53X3NpemUgLSAxOwogCi0gICAgcy0+aGFzaF9iaXRzID0gKHVJbnQpbWVtTGV2ZWwgKyA3OworICAgIGlmICh4ODZfY3B1X2VuYWJsZV9zaW1kKSB7CisgICAgICAgIHMtPmhhc2hfYml0cyA9IDE1OworICAgIH0gZWxzZSB7CisgICAgICAgIHMtPmhhc2hfYml0cyA9IG1lbUxldmVsICsgNzsKKyAgICB9CisKICAgICBzLT5oYXNoX3NpemUgPSAxIDw8IHMtPmhhc2hfYml0czsKICAgICBzLT5oYXNoX21hc2sgPSBzLT5oYXNoX3NpemUgLSAxOwogICAgIHMtPmhhc2hfc2hpZnQgPSAgKChzLT5oYXNoX2JpdHMrTUlOX01BVENILTEpL01JTl9NQVRDSCk7CiAKLSAgICBzLT53aW5kb3cgPSAoQnl0ZWYgKikgWkFMTE9DKHN0cm0sIHMtPndfc2l6ZSwgMipzaXplb2YoQnl0ZSkpOworICAgIHMtPndpbmRvdyA9IChCeXRlZiAqKSBaQUxMT0Moc3RybSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHMtPndfc2l6ZSArIHdpbmRvd19wYWRkaW5nLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMipzaXplb2YoQnl0ZSkpOwogICAgIHMtPnByZXYgICA9IChQb3NmICopICBaQUxMT0Moc3RybSwgcy0+d19zaXplLCBzaXplb2YoUG9zKSk7CiAgICAgcy0+aGVhZCAgID0gKFBvc2YgKikgIFpBTExPQyhzdHJtLCBzLT5oYXNoX3NpemUsIHNpemVvZihQb3MpKTsKIApAQCAtNDE4LDExICs0NTMsNyBAQCBpbnQgWkVYUE9SVCBkZWZsYXRlU2V0RGljdGlvbmFyeSAoc3RybSwgZGljdGlvbmFyeSwgZGljdExlbmd0aCkKICAgICAgICAgc3RyID0gcy0+c3Ryc3RhcnQ7CiAgICAgICAgIG4gPSBzLT5sb29rYWhlYWQgLSAoTUlOX01BVENILTEpOwogICAgICAgICBkbyB7Ci0gICAgICAgICAgICBVUERBVEVfSEFTSChzLCBzLT5pbnNfaCwgcy0+d2luZG93W3N0ciArIE1JTl9NQVRDSC0xXSk7Ci0jaWZuZGVmIEZBU1RFU1QKLSAgICAgICAgICAgIHMtPnByZXZbc3RyICYgcy0+d19tYXNrXSA9IHMtPmhlYWRbcy0+aW5zX2hdOwotI2VuZGlmCi0gICAgICAgICAgICBzLT5oZWFkW3MtPmluc19oXSA9IChQb3Mpc3RyOworICAgICAgICAgICAgaW5zZXJ0X3N0cmluZyhzLCBzdHIpOwogICAgICAgICAgICAgc3RyKys7CiAgICAgICAgIH0gd2hpbGUgKC0tbik7CiAgICAgICAgIHMtPnN0cnN0YXJ0ID0gc3RyOwpAQCAtODQ4LDcgKzg3OSw3IEBAIGludCBaRVhQT1JUIGRlZmxhdGUgKHN0cm0sIGZsdXNoKQogI2lmZGVmIEdaSVAKICAgICBpZiAocy0+c3RhdHVzID09IEdaSVBfU1RBVEUpIHsKICAgICAgICAgLyogZ3ppcCBoZWFkZXIgKi8KLSAgICAgICAgc3RybS0+YWRsZXIgPSBjcmMzMigwTCwgWl9OVUxMLCAwKTsKKyAgICAgICAgY3JjX3Jlc2V0KHMpOwogICAgICAgICBwdXRfYnl0ZShzLCAzMSk7CiAgICAgICAgIHB1dF9ieXRlKHMsIDEzOSk7CiAgICAgICAgIHB1dF9ieXRlKHMsIDgpOwpAQCAtMTA0OSw2ICsxMDgwLDcgQEAgaW50IFpFWFBPUlQgZGVmbGF0ZSAoc3RybSwgZmx1c2gpCiAgICAgLyogV3JpdGUgdGhlIHRyYWlsZXIgKi8KICNpZmRlZiBHWklQCiAgICAgaWYgKHMtPndyYXAgPT0gMikgeworICAgICAgICBjcmNfZmluYWxpemUocyk7CiAgICAgICAgIHB1dF9ieXRlKHMsIChCeXRlKShzdHJtLT5hZGxlciAmIDB4ZmYpKTsKICAgICAgICAgcHV0X2J5dGUocywgKEJ5dGUpKChzdHJtLT5hZGxlciA+PiA4KSAmIDB4ZmYpKTsKICAgICAgICAgcHV0X2J5dGUocywgKEJ5dGUpKChzdHJtLT5hZGxlciA+PiAxNikgJiAweGZmKSk7CkBAIC0xMTYxLDcgKzExOTMsNyBAQCBpbnQgWkVYUE9SVCBkZWZsYXRlQ29weSAoZGVzdCwgc291cmNlKQogICogYWxsb2NhdGluZyBhIGxhcmdlIHN0cm0tPm5leHRfaW4gYnVmZmVyIGFuZCBjb3B5aW5nIGZyb20gaXQuCiAgKiAoU2VlIGFsc28gZmx1c2hfcGVuZGluZygpKS4KICAqLwotbG9jYWwgdW5zaWduZWQgcmVhZF9idWYoc3RybSwgYnVmLCBzaXplKQorWkxJQl9JTlRFUk5BTCB1bnNpZ25lZCBkZWZsYXRlX3JlYWRfYnVmKHN0cm0sIGJ1Ziwgc2l6ZSkKICAgICB6X3N0cmVhbXAgc3RybTsKICAgICBCeXRlZiAqYnVmOwogICAgIHVuc2lnbmVkIHNpemU7CkBAIC0xMTczLDE1ICsxMjA1LDE2IEBAIGxvY2FsIHVuc2lnbmVkIHJlYWRfYnVmKHN0cm0sIGJ1Ziwgc2l6ZSkKIAogICAgIHN0cm0tPmF2YWlsX2luICAtPSBsZW47CiAKLSAgICB6bWVtY3B5KGJ1Ziwgc3RybS0+bmV4dF9pbiwgbGVuKTsKLSAgICBpZiAoc3RybS0+c3RhdGUtPndyYXAgPT0gMSkgewotICAgICAgICBzdHJtLT5hZGxlciA9IGFkbGVyMzIoc3RybS0+YWRsZXIsIGJ1ZiwgbGVuKTsKLSAgICB9CiAjaWZkZWYgR1pJUAotICAgIGVsc2UgaWYgKHN0cm0tPnN0YXRlLT53cmFwID09IDIpIHsKLSAgICAgICAgc3RybS0+YWRsZXIgPSBjcmMzMihzdHJtLT5hZGxlciwgYnVmLCBsZW4pOwotICAgIH0KKyAgICBpZiAoc3RybS0+c3RhdGUtPndyYXAgPT0gMikKKyAgICAgICAgY29weV93aXRoX2NyYyhzdHJtLCBidWYsIGxlbik7CisgICAgZWxzZSAKICNlbmRpZgorICAgIHsKKyAgICAgICAgem1lbWNweShidWYsIHN0cm0tPm5leHRfaW4sIGxlbik7CisgICAgICAgIGlmIChzdHJtLT5zdGF0ZS0+d3JhcCA9PSAxKQorICAgICAgICAgICAgc3RybS0+YWRsZXIgPSBhZGxlcjMyKHN0cm0tPmFkbGVyLCBidWYsIGxlbik7CisgICAgfQogICAgIHN0cm0tPm5leHRfaW4gICs9IGxlbjsKICAgICBzdHJtLT50b3RhbF9pbiArPSBsZW47CiAKQEAgLTE0NzksNyArMTUxMiwxOSBAQCBsb2NhbCB2b2lkIGNoZWNrX21hdGNoKHMsIHN0YXJ0LCBtYXRjaCwgbGVuZ3RoKQogICogICAgcGVyZm9ybWVkIGZvciBhdCBsZWFzdCB0d28gYnl0ZXMgKHJlcXVpcmVkIGZvciB0aGUgemlwIHRyYW5zbGF0ZV9lb2wKICAqICAgIG9wdGlvbiAtLSBub3Qgc3VwcG9ydGVkIGhlcmUpLgogICovCi1sb2NhbCB2b2lkIGZpbGxfd2luZG93KHMpCitsb2NhbCB2b2lkIGZpbGxfd2luZG93X2MoZGVmbGF0ZV9zdGF0ZSAqcyk7CisKK2xvY2FsIHZvaWQgZmlsbF93aW5kb3coZGVmbGF0ZV9zdGF0ZSAqcykKK3sKKyAgICBpZiAoeDg2X2NwdV9lbmFibGVfc2ltZCkgeworICAgICAgICBmaWxsX3dpbmRvd19zc2Uocyk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBmaWxsX3dpbmRvd19jKHMpOworfQorCitsb2NhbCB2b2lkIGZpbGxfd2luZG93X2MocykKICAgICBkZWZsYXRlX3N0YXRlICpzOwogewogICAgIHVuc2lnbmVkIG47CkBAIC0xODQ3LDcgKzE4OTIsNyBAQCBsb2NhbCBibG9ja19zdGF0ZSBkZWZsYXRlX2Zhc3QocywgZmx1c2gpCiAgICAgICAgICAqLwogICAgICAgICBoYXNoX2hlYWQgPSBOSUw7CiAgICAgICAgIGlmIChzLT5sb29rYWhlYWQgPj0gTUlOX01BVENIKSB7Ci0gICAgICAgICAgICBJTlNFUlRfU1RSSU5HKHMsIHMtPnN0cnN0YXJ0LCBoYXNoX2hlYWQpOworICAgICAgICAgICAgaGFzaF9oZWFkID0gaW5zZXJ0X3N0cmluZyhzLCBzLT5zdHJzdGFydCk7CiAgICAgICAgIH0KIAogICAgICAgICAvKiBGaW5kIHRoZSBsb25nZXN0IG1hdGNoLCBkaXNjYXJkaW5nIHRob3NlIDw9IHByZXZfbGVuZ3RoLgpAQCAtMTg3OCw3ICsxOTIzLDcgQEAgbG9jYWwgYmxvY2tfc3RhdGUgZGVmbGF0ZV9mYXN0KHMsIGZsdXNoKQogICAgICAgICAgICAgICAgIHMtPm1hdGNoX2xlbmd0aC0tOyAvKiBzdHJpbmcgYXQgc3Ryc3RhcnQgYWxyZWFkeSBpbiB0YWJsZSAqLwogICAgICAgICAgICAgICAgIGRvIHsKICAgICAgICAgICAgICAgICAgICAgcy0+c3Ryc3RhcnQrKzsKLSAgICAgICAgICAgICAgICAgICAgSU5TRVJUX1NUUklORyhzLCBzLT5zdHJzdGFydCwgaGFzaF9oZWFkKTsKKyAgICAgICAgICAgICAgICAgICAgaGFzaF9oZWFkID0gaW5zZXJ0X3N0cmluZyhzLCBzLT5zdHJzdGFydCk7CiAgICAgICAgICAgICAgICAgICAgIC8qIHN0cnN0YXJ0IG5ldmVyIGV4Y2VlZHMgV1NJWkUtTUFYX01BVENILCBzbyB0aGVyZSBhcmUKICAgICAgICAgICAgICAgICAgICAgICogYWx3YXlzIE1JTl9NQVRDSCBieXRlcyBhaGVhZC4KICAgICAgICAgICAgICAgICAgICAgICovCkBAIC0xOTUwLDcgKzE5OTUsNyBAQCBsb2NhbCBibG9ja19zdGF0ZSBkZWZsYXRlX3Nsb3cocywgZmx1c2gpCiAgICAgICAgICAqLwogICAgICAgICBoYXNoX2hlYWQgPSBOSUw7CiAgICAgICAgIGlmIChzLT5sb29rYWhlYWQgPj0gTUlOX01BVENIKSB7Ci0gICAgICAgICAgICBJTlNFUlRfU1RSSU5HKHMsIHMtPnN0cnN0YXJ0LCBoYXNoX2hlYWQpOworICAgICAgICAgICAgaGFzaF9oZWFkID0gaW5zZXJ0X3N0cmluZyhzLCBzLT5zdHJzdGFydCk7CiAgICAgICAgIH0KIAogICAgICAgICAvKiBGaW5kIHRoZSBsb25nZXN0IG1hdGNoLCBkaXNjYXJkaW5nIHRob3NlIDw9IHByZXZfbGVuZ3RoLgpAQCAtMjAwMSw3ICsyMDQ2LDcgQEAgbG9jYWwgYmxvY2tfc3RhdGUgZGVmbGF0ZV9zbG93KHMsIGZsdXNoKQogICAgICAgICAgICAgcy0+cHJldl9sZW5ndGggLT0gMjsKICAgICAgICAgICAgIGRvIHsKICAgICAgICAgICAgICAgICBpZiAoKytzLT5zdHJzdGFydCA8PSBtYXhfaW5zZXJ0KSB7Ci0gICAgICAgICAgICAgICAgICAgIElOU0VSVF9TVFJJTkcocywgcy0+c3Ryc3RhcnQsIGhhc2hfaGVhZCk7CisgICAgICAgICAgICAgICAgICAgIGhhc2hfaGVhZCA9IGluc2VydF9zdHJpbmcocywgcy0+c3Ryc3RhcnQpOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0gd2hpbGUgKC0tcy0+cHJldl9sZW5ndGggIT0gMCk7CiAgICAgICAgICAgICBzLT5tYXRjaF9hdmFpbGFibGUgPSAwOwpAQCAtMjE2MSwzICsyMjA2LDM3IEBAIGxvY2FsIGJsb2NrX3N0YXRlIGRlZmxhdGVfaHVmZihzLCBmbHVzaCkKICAgICAgICAgRkxVU0hfQkxPQ0socywgMCk7CiAgICAgcmV0dXJuIGJsb2NrX2RvbmU7CiB9CisKKy8qIFNhZmUgdG8gaW5saW5lIHRoaXMgYXMgR0NDL2NsYW5nIHdpbGwgdXNlIGlubGluZSBhc20gYW5kIFZpc3VhbCBTdHVkaW8gd2lsbAorICogdXNlIGludHJpbnNpYyB3aXRob3V0IGV4dHJhIHBhcmFtcworICovCitsb2NhbCBJTkxJTkUgUG9zIGluc2VydF9zdHJpbmdfc3NlKGRlZmxhdGVfc3RhdGUgKmNvbnN0IHMsIGNvbnN0IFBvcyBzdHIpCit7CisgICAgUG9zIHJldDsKKyAgICB1bnNpZ25lZCAqaXAsIHZhbCwgaCA9IDA7CisKKyAgICBpcCA9ICh1bnNpZ25lZCAqKSZzLT53aW5kb3dbc3RyXTsKKyAgICB2YWwgPSAqaXA7CisKKyAgICBpZiAocy0+bGV2ZWwgPj0gNikKKyAgICAgICAgdmFsICY9IDB4RkZGRkZGOworCisvKiBXaW5kb3dzIGNsYW5nIHNob3VsZCB1c2UgaW5saW5lIGFzbSAqLworI2lmIGRlZmluZWQoX01TQ19WRVIpICYmICFkZWZpbmVkKF9fY2xhbmdfXykKKyAgICBoID0gX21tX2NyYzMyX3UzMihoLCB2YWwpOworI2VsaWYgZGVmaW5lZChfX2kzODZfXykgfHwgZGVmaW5lZChfX2FtZDY0X18pCisgICAgX19hc21fXyBfX3ZvbGF0aWxlX18gKAorICAgICAgICAiY3JjMzIgJTEsJTBcblx0IgorICAgIDogIityIiAoaCkKKyAgICA6ICJyIiAodmFsKQorICAgICk7CisjZWxzZQorICAgIC8qIFRoaXMgc2hvdWxkIG5ldmVyIGhhcHBlbiAqLworICAgIGFzc2VydCgwKTsKKyNlbmRpZgorCisgICAgcmV0ID0gcy0+aGVhZFtoICYgcy0+aGFzaF9tYXNrXTsKKyAgICBzLT5oZWFkW2ggJiBzLT5oYXNoX21hc2tdID0gc3RyOworICAgIHMtPnByZXZbc3RyICYgcy0+d19tYXNrXSA9IHJldDsKKyAgICByZXR1cm4gcmV0OworfQpkaWZmIC0tZ2l0IGEvZGVmbGF0ZS5oIGIvZGVmbGF0ZS5oCmluZGV4IDIzZWNkZDMxMmJjMC4uYWI1NmRmNzY2M2I2IDEwMDY0NAotLS0gYS9kZWZsYXRlLmgKKysrIGIvZGVmbGF0ZS5oCkBAIC0xMDksNyArMTA5LDcgQEAgdHlwZWRlZiBzdHJ1Y3QgaW50ZXJuYWxfc3RhdGUgewogICAgIHVsZyAgIGd6aW5kZXg7ICAgICAgIC8qIHdoZXJlIGluIGV4dHJhLCBuYW1lLCBvciBjb21tZW50ICovCiAgICAgQnl0ZSAgbWV0aG9kOyAgICAgICAgLyogY2FuIG9ubHkgYmUgREVGTEFURUQgKi8KICAgICBpbnQgICBsYXN0X2ZsdXNoOyAgICAvKiB2YWx1ZSBvZiBmbHVzaCBwYXJhbSBmb3IgcHJldmlvdXMgZGVmbGF0ZSBjYWxsICovCi0KKyAgICB1bnNpZ25lZCB6YWxpZ24oMTYpIGNyYzBbNCAqIDVdOwogICAgICAgICAgICAgICAgIC8qIHVzZWQgYnkgZGVmbGF0ZS5jOiAqLwogCiAgICAgdUludCAgd19zaXplOyAgICAgICAgLyogTFo3NyB3aW5kb3cgc2l6ZSAoMzJLIGJ5IGRlZmF1bHQpICovCkBAIC0zNDYsNCArMzQ2LDE0IEBAIHZvaWQgWkxJQl9JTlRFUk5BTCBfdHJfc3RvcmVkX2Jsb2NrIE9GKChkZWZsYXRlX3N0YXRlICpzLCBjaGFyZiAqYnVmLAogICAgICAgICAgICAgICBmbHVzaCA9IF90cl90YWxseShzLCBkaXN0YW5jZSwgbGVuZ3RoKQogI2VuZGlmCiAKKy8qIEZ1bmN0aW9ucyB0aGF0IGFyZSBTSU1EIG9wdGltaXNlZCBvbiB4ODYgKi8KK3ZvaWQgWkxJQl9JTlRFUk5BTCBjcmNfZm9sZF9pbml0KGRlZmxhdGVfc3RhdGUqIGNvbnN0IHMpOwordm9pZCBaTElCX0lOVEVSTkFMIGNyY19mb2xkX2NvcHkoZGVmbGF0ZV9zdGF0ZSogY29uc3QgcywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGNoYXIqIGRzdCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IHVuc2lnbmVkIGNoYXIqIHNyYywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxvbmcgbGVuKTsKK3Vuc2lnbmVkIFpMSUJfSU5URVJOQUwgY3JjX2ZvbGRfNTEydG8zMihkZWZsYXRlX3N0YXRlKiBjb25zdCBzKTsKKwordm9pZCBaTElCX0lOVEVSTkFMIGZpbGxfd2luZG93X3NzZShkZWZsYXRlX3N0YXRlKiBzKTsKKwogI2VuZGlmIC8qIERFRkxBVEVfSCAqLwpkaWZmIC0tZ2l0IGEvZmlsbF93aW5kb3dfc3NlLmMgYi9maWxsX3dpbmRvd19zc2UuYwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLjk0OWNjY2UxYmE5YwotLS0gL2Rldi9udWxsCisrKyBiL2ZpbGxfd2luZG93X3NzZS5jCkBAIC0wLDAgKzEsMTc3IEBACisvKgorICogRmlsbCBXaW5kb3cgd2l0aCBTU0UyLW9wdGltaXplZCBoYXNoIHNoaWZ0aW5nCisgKgorICogQ29weXJpZ2h0IChDKSAyMDEzIEludGVsIENvcnBvcmF0aW9uCisgKiBBdXRob3JzOgorICogIEFyamFuIHZhbiBkZSBWZW4gICAgPGFyamFuQGxpbnV4LmludGVsLmNvbT4KKyAqICBKaW0gS3VrdW5hcyAgICAgICAgIDxqYW1lcy50Lmt1a3VuYXNAbGludXguaW50ZWwuY29tPgorICoKKyAqIEZvciBjb25kaXRpb25zIG9mIGRpc3RyaWJ1dGlvbiBhbmQgdXNlLCBzZWUgY29weXJpZ2h0IG5vdGljZSBpbiB6bGliLmgKKyAqLworCisjaW5jbHVkZSA8aW1taW50cmluLmg+CisjaW5jbHVkZSAiZGVmbGF0ZS5oIgorCisjZGVmaW5lIFVQREFURV9IQVNIKHMsaCxpKSBcCisgICAge1wKKyAgICAgICAgaWYgKHMtPmxldmVsIDwgNikgeyBcCisgICAgICAgICAgICBoID0gKDM0ODMgKiAocy0+d2luZG93W2ldKSArXAorICAgICAgICAgICAgICAgICAyMzA4MSogKHMtPndpbmRvd1tpKzFdKSArXAorICAgICAgICAgICAgICAgICA2OTU0ICogKHMtPndpbmRvd1tpKzJdKSArXAorICAgICAgICAgICAgICAgICAyMDk0NyogKHMtPndpbmRvd1tpKzNdKSkgJiBzLT5oYXNoX21hc2s7XAorICAgICAgICB9IGVsc2Uge1wKKyAgICAgICAgICAgIGggPSAoMjU4ODEqIChzLT53aW5kb3dbaV0pICtcCisgICAgICAgICAgICAgICAgIDI0Njc0KiAocy0+d2luZG93W2krMV0pICtcCisgICAgICAgICAgICAgICAgIDI1ODExKiAocy0+d2luZG93W2krMl0pKSAmIHMtPmhhc2hfbWFzaztcCisgICAgICAgIH1cCisgICAgfVwKKworZXh0ZXJuIGludCBkZWZsYXRlX3JlYWRfYnVmIE9GKCh6X3N0cmVhbXAgc3RybSwgQnl0ZWYgKmJ1ZiwgdW5zaWduZWQgc2l6ZSkpOworCit2b2lkIGZpbGxfd2luZG93X3NzZShkZWZsYXRlX3N0YXRlICpzKQoreworICAgIGNvbnN0IF9fbTEyOGkgeG1tX3dzaXplID0gX21tX3NldDFfZXBpMTYocy0+d19zaXplKTsKKworICAgIHJlZ2lzdGVyIHVuc2lnbmVkIG47CisgICAgcmVnaXN0ZXIgUG9zZiAqcDsKKyAgICB1bnNpZ25lZCBtb3JlOyAgICAvKiBBbW91bnQgb2YgZnJlZSBzcGFjZSBhdCB0aGUgZW5kIG9mIHRoZSB3aW5kb3cuICovCisgICAgdUludCB3c2l6ZSA9IHMtPndfc2l6ZTsKKworICAgIEFzc2VydChzLT5sb29rYWhlYWQgPCBNSU5fTE9PS0FIRUFELCAiYWxyZWFkeSBlbm91Z2ggbG9va2FoZWFkIik7CisKKyAgICBkbyB7CisgICAgICAgIG1vcmUgPSAodW5zaWduZWQpKHMtPndpbmRvd19zaXplIC0odWxnKXMtPmxvb2thaGVhZCAtKHVsZylzLT5zdHJzdGFydCk7CisKKyAgICAgICAgLyogRGVhbCB3aXRoICFAIyQlIDY0SyBsaW1pdDogKi8KKyAgICAgICAgaWYgKHNpemVvZihpbnQpIDw9IDIpIHsKKyAgICAgICAgICAgIGlmIChtb3JlID09IDAgJiYgcy0+c3Ryc3RhcnQgPT0gMCAmJiBzLT5sb29rYWhlYWQgPT0gMCkgeworICAgICAgICAgICAgICAgIG1vcmUgPSB3c2l6ZTsKKworICAgICAgICAgICAgfSBlbHNlIGlmIChtb3JlID09ICh1bnNpZ25lZCkoLTEpKSB7CisgICAgICAgICAgICAgICAgLyogVmVyeSB1bmxpa2VseSwgYnV0IHBvc3NpYmxlIG9uIDE2IGJpdCBtYWNoaW5lIGlmCisgICAgICAgICAgICAgICAgICogc3Ryc3RhcnQgPT0gMCAmJiBsb29rYWhlYWQgPT0gMSAoaW5wdXQgZG9uZSBhIGJ5dGUgYXQgdGltZSkKKyAgICAgICAgICAgICAgICAgKi8KKyAgICAgICAgICAgICAgICBtb3JlLS07CisgICAgICAgICAgICB9CisgICAgICAgIH0KKworICAgICAgICAvKiBJZiB0aGUgd2luZG93IGlzIGFsbW9zdCBmdWxsIGFuZCB0aGVyZSBpcyBpbnN1ZmZpY2llbnQgbG9va2FoZWFkLAorICAgICAgICAgKiBtb3ZlIHRoZSB1cHBlciBoYWxmIHRvIHRoZSBsb3dlciBvbmUgdG8gbWFrZSByb29tIGluIHRoZSB1cHBlciBoYWxmLgorICAgICAgICAgKi8KKyAgICAgICAgaWYgKHMtPnN0cnN0YXJ0ID49IHdzaXplK01BWF9ESVNUKHMpKSB7CisKKyAgICAgICAgICAgIHptZW1jcHkocy0+d2luZG93LCBzLT53aW5kb3crd3NpemUsICh1bnNpZ25lZCl3c2l6ZSk7CisgICAgICAgICAgICBzLT5tYXRjaF9zdGFydCAtPSB3c2l6ZTsKKyAgICAgICAgICAgIHMtPnN0cnN0YXJ0ICAgIC09IHdzaXplOyAvKiB3ZSBub3cgaGF2ZSBzdHJzdGFydCA+PSBNQVhfRElTVCAqLworICAgICAgICAgICAgcy0+YmxvY2tfc3RhcnQgLT0gKGxvbmcpIHdzaXplOworCisgICAgICAgICAgICAvKiBTbGlkZSB0aGUgaGFzaCB0YWJsZSAoY291bGQgYmUgYXZvaWRlZCB3aXRoIDMyIGJpdCB2YWx1ZXMKKyAgICAgICAgICAgICAgIGF0IHRoZSBleHBlbnNlIG9mIG1lbW9yeSB1c2FnZSkuIFdlIHNsaWRlIGV2ZW4gd2hlbiBsZXZlbCA9PSAwCisgICAgICAgICAgICAgICB0byBrZWVwIHRoZSBoYXNoIHRhYmxlIGNvbnNpc3RlbnQgaWYgd2Ugc3dpdGNoIGJhY2sgdG8gbGV2ZWwgPiAwCisgICAgICAgICAgICAgICBsYXRlci4gKFVzaW5nIGxldmVsIDAgcGVybWFuZW50bHkgaXMgbm90IGFuIG9wdGltYWwgdXNhZ2Ugb2YKKyAgICAgICAgICAgICAgIHpsaWIsIHNvIHdlIGRvbid0IGNhcmUgYWJvdXQgdGhpcyBwYXRob2xvZ2ljYWwgY2FzZS4pCisgICAgICAgICAgICAgKi8KKyAgICAgICAgICAgIG4gPSBzLT5oYXNoX3NpemU7CisgICAgICAgICAgICBwID0gJnMtPmhlYWRbbl07CisgICAgICAgICAgICBwIC09IDg7CisgICAgICAgICAgICBkbyB7CisgICAgICAgICAgICAgICAgX19tMTI4aSB2YWx1ZSwgcmVzdWx0OworCisgICAgICAgICAgICAgICAgdmFsdWUgPSBfbW1fbG9hZHVfc2kxMjgoKF9fbTEyOGkgKilwKTsKKyAgICAgICAgICAgICAgICByZXN1bHQgPSBfbW1fc3Vic19lcHUxNih2YWx1ZSwgeG1tX3dzaXplKTsKKyAgICAgICAgICAgICAgICBfbW1fc3RvcmV1X3NpMTI4KChfX20xMjhpICopcCwgcmVzdWx0KTsKKworICAgICAgICAgICAgICAgIHAgLT0gODsKKyAgICAgICAgICAgICAgICBuIC09IDg7CisgICAgICAgICAgICB9IHdoaWxlIChuID4gMCk7CisKKyAgICAgICAgICAgIG4gPSB3c2l6ZTsKKyNpZm5kZWYgRkFTVEVTVAorICAgICAgICAgICAgcCA9ICZzLT5wcmV2W25dOworICAgICAgICAgICAgcCAtPSA4OworICAgICAgICAgICAgZG8geworICAgICAgICAgICAgICAgIF9fbTEyOGkgdmFsdWUsIHJlc3VsdDsKKworICAgICAgICAgICAgICAgIHZhbHVlID0gX21tX2xvYWR1X3NpMTI4KChfX20xMjhpICopcCk7CisgICAgICAgICAgICAgICAgcmVzdWx0ID0gX21tX3N1YnNfZXB1MTYodmFsdWUsIHhtbV93c2l6ZSk7CisgICAgICAgICAgICAgICAgX21tX3N0b3JldV9zaTEyOCgoX19tMTI4aSAqKXAsIHJlc3VsdCk7CisKKyAgICAgICAgICAgICAgICBwIC09IDg7CisgICAgICAgICAgICAgICAgbiAtPSA4OworICAgICAgICAgICAgfSB3aGlsZSAobiA+IDApOworI2VuZGlmCisgICAgICAgICAgICBtb3JlICs9IHdzaXplOworICAgICAgICB9CisgICAgICAgIGlmIChzLT5zdHJtLT5hdmFpbF9pbiA9PSAwKSBicmVhazsKKworICAgICAgICAvKiBJZiB0aGVyZSB3YXMgbm8gc2xpZGluZzoKKyAgICAgICAgICogICAgc3Ryc3RhcnQgPD0gV1NJWkUrTUFYX0RJU1QtMSAmJiBsb29rYWhlYWQgPD0gTUlOX0xPT0tBSEVBRCAtIDEgJiYKKyAgICAgICAgICogICAgbW9yZSA9PSB3aW5kb3dfc2l6ZSAtIGxvb2thaGVhZCAtIHN0cnN0YXJ0CisgICAgICAgICAqID0+IG1vcmUgPj0gd2luZG93X3NpemUgLSAoTUlOX0xPT0tBSEVBRC0xICsgV1NJWkUgKyBNQVhfRElTVC0xKQorICAgICAgICAgKiA9PiBtb3JlID49IHdpbmRvd19zaXplIC0gMipXU0laRSArIDIKKyAgICAgICAgICogSW4gdGhlIEJJR19NRU0gb3IgTU1BUCBjYXNlIChub3QgeWV0IHN1cHBvcnRlZCksCisgICAgICAgICAqICAgd2luZG93X3NpemUgPT0gaW5wdXRfc2l6ZSArIE1JTl9MT09LQUhFQUQgICYmCisgICAgICAgICAqICAgc3Ryc3RhcnQgKyBzLT5sb29rYWhlYWQgPD0gaW5wdXRfc2l6ZSA9PiBtb3JlID49IE1JTl9MT09LQUhFQUQuCisgICAgICAgICAqIE90aGVyd2lzZSwgd2luZG93X3NpemUgPT0gMipXU0laRSBzbyBtb3JlID49IDIuCisgICAgICAgICAqIElmIHRoZXJlIHdhcyBzbGlkaW5nLCBtb3JlID49IFdTSVpFLiBTbyBpbiBhbGwgY2FzZXMsIG1vcmUgPj0gMi4KKyAgICAgICAgICovCisgICAgICAgIEFzc2VydChtb3JlID49IDIsICJtb3JlIDwgMiIpOworCisgICAgICAgIG4gPSBkZWZsYXRlX3JlYWRfYnVmKHMtPnN0cm0sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHMtPndpbmRvdyArIHMtPnN0cnN0YXJ0ICsgcy0+bG9va2FoZWFkLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtb3JlKTsKKyAgICAgICAgcy0+bG9va2FoZWFkICs9IG47CisKKyAgICAgICAgLyogSW5pdGlhbGl6ZSB0aGUgaGFzaCB2YWx1ZSBub3cgdGhhdCB3ZSBoYXZlIHNvbWUgaW5wdXQ6ICovCisgICAgICAgIGlmIChzLT5sb29rYWhlYWQgPj0gTUlOX01BVENIKSB7CisgICAgICAgICAgICB1SW50IHN0ciA9IHMtPnN0cnN0YXJ0OworICAgICAgICAgICAgcy0+aW5zX2ggPSBzLT53aW5kb3dbc3RyXTsKKyAgICAgICAgICAgIGlmIChzdHIgPj0gMSkKKyAgICAgICAgICAgICAgICBVUERBVEVfSEFTSChzLCBzLT5pbnNfaCwgc3RyICsgMSAtIChNSU5fTUFUQ0gtMSkpOworI2lmIE1JTl9NQVRDSCAhPSAzCisgICAgICAgICAgICBDYWxsIFVQREFURV9IQVNIKCkgTUlOX01BVENILTMgbW9yZSB0aW1lcworI2VuZGlmCisgICAgICAgIH0KKyAgICAgICAgLyogSWYgdGhlIHdob2xlIGlucHV0IGhhcyBsZXNzIHRoYW4gTUlOX01BVENIIGJ5dGVzLCBpbnNfaCBpcyBnYXJiYWdlLAorICAgICAgICAgKiBidXQgdGhpcyBpcyBub3QgaW1wb3J0YW50IHNpbmNlIG9ubHkgbGl0ZXJhbCBieXRlcyB3aWxsIGJlIGVtaXR0ZWQuCisgICAgICAgICAqLworCisgICAgfSB3aGlsZSAocy0+bG9va2FoZWFkIDwgTUlOX0xPT0tBSEVBRCAmJiBzLT5zdHJtLT5hdmFpbF9pbiAhPSAwKTsKKworICAgIC8qIElmIHRoZSBXSU5fSU5JVCBieXRlcyBhZnRlciB0aGUgZW5kIG9mIHRoZSBjdXJyZW50IGRhdGEgaGF2ZSBuZXZlciBiZWVuCisgICAgICogd3JpdHRlbiwgdGhlbiB6ZXJvIHRob3NlIGJ5dGVzIGluIG9yZGVyIHRvIGF2b2lkIG1lbW9yeSBjaGVjayByZXBvcnRzIG9mCisgICAgICogdGhlIHVzZSBvZiB1bmluaXRpYWxpemVkIChvciB1bmluaXRpYWxpc2VkIGFzIEp1bGlhbiB3cml0ZXMpIGJ5dGVzIGJ5CisgICAgICogdGhlIGxvbmdlc3QgbWF0Y2ggcm91dGluZXMuICBVcGRhdGUgdGhlIGhpZ2ggd2F0ZXIgbWFyayBmb3IgdGhlIG5leHQKKyAgICAgKiB0aW1lIHRocm91Z2ggaGVyZS4gIFdJTl9JTklUIGlzIHNldCB0byBNQVhfTUFUQ0ggc2luY2UgdGhlIGxvbmdlc3QgbWF0Y2gKKyAgICAgKiByb3V0aW5lcyBhbGxvdyBzY2FubmluZyB0byBzdHJzdGFydCArIE1BWF9NQVRDSCwgaWdub3JpbmcgbG9va2FoZWFkLgorICAgICAqLworICAgIGlmIChzLT5oaWdoX3dhdGVyIDwgcy0+d2luZG93X3NpemUpIHsKKyAgICAgICAgdWxnIGN1cnIgPSBzLT5zdHJzdGFydCArICh1bGcpKHMtPmxvb2thaGVhZCk7CisgICAgICAgIHVsZyBpbml0OworCisgICAgICAgIGlmIChzLT5oaWdoX3dhdGVyIDwgY3VycikgeworICAgICAgICAgICAgLyogUHJldmlvdXMgaGlnaCB3YXRlciBtYXJrIGJlbG93IGN1cnJlbnQgZGF0YSAtLSB6ZXJvIFdJTl9JTklUCisgICAgICAgICAgICAgKiBieXRlcyBvciB1cCB0byBlbmQgb2Ygd2luZG93LCB3aGljaGV2ZXIgaXMgbGVzcy4KKyAgICAgICAgICAgICAqLworICAgICAgICAgICAgaW5pdCA9IHMtPndpbmRvd19zaXplIC0gY3VycjsKKyAgICAgICAgICAgIGlmIChpbml0ID4gV0lOX0lOSVQpCisgICAgICAgICAgICAgICAgaW5pdCA9IFdJTl9JTklUOworICAgICAgICAgICAgem1lbXplcm8ocy0+d2luZG93ICsgY3VyciwgKHVuc2lnbmVkKWluaXQpOworICAgICAgICAgICAgcy0+aGlnaF93YXRlciA9IGN1cnIgKyBpbml0OworICAgICAgICB9CisgICAgICAgIGVsc2UgaWYgKHMtPmhpZ2hfd2F0ZXIgPCAodWxnKWN1cnIgKyBXSU5fSU5JVCkgeworICAgICAgICAgICAgLyogSGlnaCB3YXRlciBtYXJrIGF0IG9yIGFib3ZlIGN1cnJlbnQgZGF0YSwgYnV0IGJlbG93IGN1cnJlbnQgZGF0YQorICAgICAgICAgICAgICogcGx1cyBXSU5fSU5JVCAtLSB6ZXJvIG91dCB0byBjdXJyZW50IGRhdGEgcGx1cyBXSU5fSU5JVCwgb3IgdXAKKyAgICAgICAgICAgICAqIHRvIGVuZCBvZiB3aW5kb3csIHdoaWNoZXZlciBpcyBsZXNzLgorICAgICAgICAgICAgICovCisgICAgICAgICAgICBpbml0ID0gKHVsZyljdXJyICsgV0lOX0lOSVQgLSBzLT5oaWdoX3dhdGVyOworICAgICAgICAgICAgaWYgKGluaXQgPiBzLT53aW5kb3dfc2l6ZSAtIHMtPmhpZ2hfd2F0ZXIpCisgICAgICAgICAgICAgICAgaW5pdCA9IHMtPndpbmRvd19zaXplIC0gcy0+aGlnaF93YXRlcjsKKyAgICAgICAgICAgIHptZW16ZXJvKHMtPndpbmRvdyArIHMtPmhpZ2hfd2F0ZXIsICh1bnNpZ25lZClpbml0KTsKKyAgICAgICAgICAgIHMtPmhpZ2hfd2F0ZXIgKz0gaW5pdDsKKyAgICAgICAgfQorICAgIH0KKworICAgIEFzc2VydCgodWxnKXMtPnN0cnN0YXJ0IDw9IHMtPndpbmRvd19zaXplIC0gTUlOX0xPT0tBSEVBRCwKKyAgICAgICAgICAgIm5vdCBlbm91Z2ggcm9vbSBmb3Igc2VhcmNoIik7Cit9CmRpZmYgLS1naXQgYS9zaW1kX3N0dWIuYyBiL3NpbWRfc3R1Yi5jCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMC4uYzZkNDYwNTE0OThmCi0tLSAvZGV2L251bGwKKysrIGIvc2ltZF9zdHViLmMKQEAgLTAsMCArMSwzNSBAQAorLyogc2ltZF9zdHViLmMgLS0gc3R1YiBpbXBsZW1lbnRhdGlvbnMKKyogQ29weXJpZ2h0IChDKSAyMDE0IEludGVsIENvcnBvcmF0aW9uCisqIEZvciBjb25kaXRpb25zIG9mIGRpc3RyaWJ1dGlvbiBhbmQgdXNlLCBzZWUgY29weXJpZ2h0IG5vdGljZSBpbiB6bGliLmgKKyovCisjaW5jbHVkZSA8YXNzZXJ0Lmg+CisKKyNpbmNsdWRlICJkZWZsYXRlLmgiCisjaW5jbHVkZSAieDg2LmgiCisKK2ludCBaTElCX0lOVEVSTkFMIHg4Nl9jcHVfZW5hYmxlX3NpbWQgPSAwOworCit2b2lkIFpMSUJfSU5URVJOQUwgY3JjX2ZvbGRfaW5pdChkZWZsYXRlX3N0YXRlICpjb25zdCBzKSB7CisgICAgYXNzZXJ0KDApOworfQorCit2b2lkIFpMSUJfSU5URVJOQUwgY3JjX2ZvbGRfY29weShkZWZsYXRlX3N0YXRlICpjb25zdCBzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgY2hhciAqZHN0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgdW5zaWduZWQgY2hhciAqc3JjLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbG9uZyBsZW4pIHsKKyAgICBhc3NlcnQoMCk7Cit9CisKK3Vuc2lnbmVkIFpMSUJfSU5URVJOQUwgY3JjX2ZvbGRfNTEydG8zMihkZWZsYXRlX3N0YXRlICpjb25zdCBzKSB7CisgICAgYXNzZXJ0KDApOworICAgIHJldHVybiAwOworfQorCit2b2lkIFpMSUJfSU5URVJOQUwgZmlsbF93aW5kb3dfc3NlKGRlZmxhdGVfc3RhdGUgKnMpCit7CisgICAgYXNzZXJ0KDApOworfQorCit2b2lkIHg4Nl9jaGVja19mZWF0dXJlcyh2b2lkKQoreworfQpkaWZmIC0tZ2l0IGEveDg2LmMgYi94ODYuYwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLmU1NmZlOGI4NWEzOQotLS0gL2Rldi9udWxsCisrKyBiL3g4Ni5jCkBAIC0wLDAgKzEsOTIgQEAKKy8qCisgKiB4ODYgZmVhdHVyZSBjaGVjaworICoKKyAqIENvcHlyaWdodCAoQykgMjAxMyBJbnRlbCBDb3Jwb3JhdGlvbi4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIEF1dGhvcjoKKyAqICBKaW0gS3VrdW5hcworICogCisgKiBGb3IgY29uZGl0aW9ucyBvZiBkaXN0cmlidXRpb24gYW5kIHVzZSwgc2VlIGNvcHlyaWdodCBub3RpY2UgaW4gemxpYi5oCisgKi8KKworI2luY2x1ZGUgIng4Ni5oIgorI2luY2x1ZGUgInp1dGlsLmgiCisKK2ludCBaTElCX0lOVEVSTkFMIHg4Nl9jcHVfZW5hYmxlX3NpbWQgPSAwOworCisjaWZuZGVmIF9NU0NfVkVSCisjaW5jbHVkZSA8cHRocmVhZC5oPgorCitwdGhyZWFkX29uY2VfdCBjcHVfY2hlY2tfaW5pdGVkX29uY2UgPSBQVEhSRUFEX09OQ0VfSU5JVDsKK3N0YXRpYyB2b2lkIF94ODZfY2hlY2tfZmVhdHVyZXModm9pZCk7CisKK3ZvaWQgeDg2X2NoZWNrX2ZlYXR1cmVzKHZvaWQpCit7CisgIHB0aHJlYWRfb25jZSgmY3B1X2NoZWNrX2luaXRlZF9vbmNlLCBfeDg2X2NoZWNrX2ZlYXR1cmVzKTsKK30KKworc3RhdGljIHZvaWQgX3g4Nl9jaGVja19mZWF0dXJlcyh2b2lkKQoreworICAgIGludCB4ODZfY3B1X2hhc19zc2UyOworICAgIGludCB4ODZfY3B1X2hhc19zc2U0MjsKKyAgICBpbnQgeDg2X2NwdV9oYXNfcGNsbXVscWRxOworICAgIHVuc2lnbmVkIGVheCwgZWJ4LCBlY3gsIGVkeDsKKworICAgIGVheCA9IDE7CisjaWZkZWYgX19pMzg2X18KKyAgICBfX2FzbV9fIF9fdm9sYXRpbGVfXyAoCisgICAgICAgICJ4Y2hnICUlZWJ4LCAlMVxuXHQiCisgICAgICAgICJjcHVpZFxuXHQiCisgICAgICAgICJ4Y2hnICUxLCAlJWVieFxuXHQiCisgICAgOiAiK2EiIChlYXgpLCAiPVMiIChlYngpLCAiPWMiIChlY3gpLCAiPWQiIChlZHgpCisgICAgKTsKKyNlbHNlCisgICAgX19hc21fXyBfX3ZvbGF0aWxlX18gKAorICAgICAgICAiY3B1aWRcblx0IgorICAgIDogIithIiAoZWF4KSwgIj1iIiAoZWJ4KSwgIj1jIiAoZWN4KSwgIj1kIiAoZWR4KQorICAgICk7CisjZW5kaWYgIC8qIChfX2kzODZfXykgKi8KKworICAgIHg4Nl9jcHVfaGFzX3NzZTIgPSBlZHggJiAweDQwMDAwMDA7CisgICAgeDg2X2NwdV9oYXNfc3NlNDIgPSBlY3ggJiAweDEwMDAwMDsKKyAgICB4ODZfY3B1X2hhc19wY2xtdWxxZHEgPSBlY3ggJiAweDI7CisKKyAgICB4ODZfY3B1X2VuYWJsZV9zaW1kID0geDg2X2NwdV9oYXNfc3NlMiAmJgorICAgICAgICAgICAgICAgICAgICAgICAgICB4ODZfY3B1X2hhc19zc2U0MiAmJgorICAgICAgICAgICAgICAgICAgICAgICAgICB4ODZfY3B1X2hhc19wY2xtdWxxZHE7Cit9CisjZWxzZQorI2luY2x1ZGUgPGludHJpbi5oPgorI2luY2x1ZGUgPHdpbmRvd3MuaD4KKworc3RhdGljIEJPT0wgQ0FMTEJBQ0sgX3g4Nl9jaGVja19mZWF0dXJlcyhQSU5JVF9PTkNFIG9uY2UsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBWT0lEIHBhcmFtLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQVk9JRCAqY29udGV4dCk7CitzdGF0aWMgSU5JVF9PTkNFIGNwdV9jaGVja19pbml0ZWRfb25jZSA9IElOSVRfT05DRV9TVEFUSUNfSU5JVDsKKwordm9pZCB4ODZfY2hlY2tfZmVhdHVyZXModm9pZCkKK3sKKyAgICBJbml0T25jZUV4ZWN1dGVPbmNlKCZjcHVfY2hlY2tfaW5pdGVkX29uY2UsIF94ODZfY2hlY2tfZmVhdHVyZXMsCisgICAgICAgICAgICAgICAgICAgICAgICBOVUxMLCBOVUxMKTsKK30KKworc3RhdGljIEJPT0wgQ0FMTEJBQ0sgX3g4Nl9jaGVja19mZWF0dXJlcyhQSU5JVF9PTkNFIG9uY2UsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBWT0lEIHBhcmFtLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQVk9JRCAqY29udGV4dCkKK3sKKyAgICBpbnQgeDg2X2NwdV9oYXNfc3NlMjsKKyAgICBpbnQgeDg2X2NwdV9oYXNfc3NlNDI7CisgICAgaW50IHg4Nl9jcHVfaGFzX3BjbG11bHFkcTsKKyAgICBpbnQgcmVnc1s0XTsKKworICAgIF9fY3B1aWQocmVncywgMSk7CisKKyAgICB4ODZfY3B1X2hhc19zc2UyID0gcmVnc1szXSAmIDB4NDAwMDAwMDsKKyAgICB4ODZfY3B1X2hhc19zc2U0Mj0gcmVnc1syXSAmIDB4MTAwMDAwOworICAgIHg4Nl9jcHVfaGFzX3BjbG11bHFkcSA9IHJlZ3NbMl0gJiAweDI7CisKKyAgICB4ODZfY3B1X2VuYWJsZV9zaW1kID0geDg2X2NwdV9oYXNfc3NlMiAmJgorICAgICAgICAgICAgICAgICAgICAgICAgICB4ODZfY3B1X2hhc19zc2U0MiAmJgorICAgICAgICAgICAgICAgICAgICAgICAgICB4ODZfY3B1X2hhc19wY2xtdWxxZHE7CisgICAgcmV0dXJuIFRSVUU7Cit9CisjZW5kaWYgIC8qIF9NU0NfVkVSICovCmRpZmYgLS1naXQgYS94ODYuaCBiL3g4Ni5oCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMC4uZWJjZjEwYWIwOWQyCi0tLSAvZGV2L251bGwKKysrIGIveDg2LmgKQEAgLTAsMCArMSwxNSBAQAorLyogeDg2LmggLS0gY2hlY2sgZm9yIHg4NiBDUFUgZmVhdHVyZXMKKyogQ29weXJpZ2h0IChDKSAyMDEzIEludGVsIENvcnBvcmF0aW9uIEppbSBLdWt1bmFzCisqIEZvciBjb25kaXRpb25zIG9mIGRpc3RyaWJ1dGlvbiBhbmQgdXNlLCBzZWUgY29weXJpZ2h0IG5vdGljZSBpbiB6bGliLmgKKyovCisKKyNpZm5kZWYgWDg2X0gKKyNkZWZpbmUgWDg2X0gKKworI2luY2x1ZGUgInpsaWIuaCIKKworZXh0ZXJuIGludCB4ODZfY3B1X2VuYWJsZV9zaW1kOworCit2b2lkIHg4Nl9jaGVja19mZWF0dXJlcyh2b2lkKTsKKworI2VuZGlmICAvKiBYODZfSCAqLwpkaWZmIC0tZ2l0IGEvenV0aWwuaCBiL3p1dGlsLmgKaW5kZXggODAzNzViOGI2MTA5Li40NDI1YmNmNzVlYjMgMTAwNjQ0Ci0tLSBhL3p1dGlsLmgKKysrIGIvenV0aWwuaApAQCAtMjgzLDQgKzI4MywxMCBAQCBleHRlcm4gel9jb25zdCBjaGFyICogY29uc3Qgel9lcnJtc2dbMTBdOyAvKiBpbmRleGVkIGJ5IDItemxpYl9lcnJvciAqLwogI2RlZmluZSBaU1dBUDMyKHEpICgoKChxKSA+PiAyNCkgJiAweGZmKSArICgoKHEpID4+IDgpICYgMHhmZjAwKSArIFwKICAgICAgICAgICAgICAgICAgICAgKCgocSkgJiAweGZmMDApIDw8IDgpICsgKCgocSkgJiAweGZmKSA8PCAyNCkpCiAKKyNpZmRlZiBfTVNDX1ZFUgorI2RlZmluZSB6YWxpZ24oeCkgX19kZWNsc3BlYyhhbGlnbih4KSkKKyNlbHNlCisjZGVmaW5lIHphbGlnbih4KSBfX2F0dHJpYnV0ZV9fKChhbGlnbmVkKCh4KSkpKQorI2VuZGlmCisKICNlbmRpZiAvKiBaVVRJTF9IICovCg== \ No newline at end of file diff --git a/testing/chromium/patches/0002-uninitializedcheck.patch b/testing/chromium/patches/0002-uninitializedcheck.patch deleted file mode 100644 index 83de17c5..00000000 --- a/testing/chromium/patches/0002-uninitializedcheck.patch +++ /dev/null @@ -1 +0,0 @@ -RnJvbSAxYTAzZTdhZWM5NWQ4OWM2NTlmZDkxZjE5NWI5OTg5M2I2NDU4Y2Q3IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBBZGVuaWxzb24gQ2F2YWxjYW50aSA8YWRlbmlsc29uLmNhdmFsY2FudGlAYXJtLmNvbT4KRGF0ZTogV2VkLCAyNyBTZXAgMjAxNyAxMzo1OTowNCAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIFpsaWIgcGF0Y2g6IHByZXZlbnQgdW5pbml0aWFsaXplZCB1c2Ugb2Ygc3RhdGUtPmNoZWNrCgpObyBuZWVkIHRvIGNhbGwgdGhlIEFkbGVyMzIgY2hlY2tzdW0gZnVuY3Rpb24sIGp1c3Qgc2V0CnRoZSBzdHJ1Y3QgZmllbGQgdG8gdGhlIGV4cGVjdGVkIHZhbHVlLgoKVXBzdHJlYW0gYnVnOiBtYWRsZXIvemxpYiMyNDUKLS0tCiB0aGlyZF9wYXJ0eS96bGliL2luZmxhdGUuYyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgMiArLQogMSBmaWxlcyBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMSBkZWxldGlvbnMoLSkKIGRlbGV0ZSBtb2RlIDEwMDY0NCB0aGlyZF9wYXJ0eS96bGliL3BhdGNoZXMvMDAwMi11bmluaXRpYWxpemVkY2hlY2sucGF0Y2gKCmRpZmYgLS1naXQgYS90aGlyZF9wYXJ0eS96bGliL2luZmxhdGUuYyBiL3RoaXJkX3BhcnR5L3psaWIvaW5mbGF0ZS5jCmluZGV4IGJlYzk0OTcuLjVjNDBjZjEgMTAwNjQ0Ci0tLSBhL3RoaXJkX3BhcnR5L3psaWIvaW5mbGF0ZS5jCisrKyBiL3RoaXJkX3BhcnR5L3psaWIvaW5mbGF0ZS5jCkBAIC0yMjgsNyArMjI4LDcgQEAgaW50IHN0cmVhbV9zaXplOwogICAgIHN0YXRlLT5zdHJtID0gc3RybTsKICAgICBzdGF0ZS0+d2luZG93ID0gWl9OVUxMOwogICAgIHN0YXRlLT5tb2RlID0gSEVBRDsgICAgIC8qIHRvIHBhc3Mgc3RhdGUgdGVzdCBpbiBpbmZsYXRlUmVzZXQyKCkgKi8KLSAgICBzdGF0ZS0+Y2hlY2sgPSBhZGxlcjMyKDBMLCBaX05VTEwsIDApOworICAgIHN0YXRlLT5jaGVjayA9IDFMOyAgICAgIC8qIDFMIGlzIHRoZSByZXN1bHQgb2YgYWRsZXIzMigpIHplcm8gbGVuZ3RoIGRhdGEgKi8KICAgICByZXQgPSBpbmZsYXRlUmVzZXQyKHN0cm0sIHdpbmRvd0JpdHMpOwogICAgIGlmIChyZXQgIT0gWl9PSykgewogICAgICAgICBaRlJFRShzdHJtLCBzdGF0ZSk7Cg== \ No newline at end of file diff --git a/testing/chromium/patches/0003-disable-autofill-download-manager.patch b/testing/chromium/patches/0003-disable-autofill-download-manager.patch deleted file mode 100644 index 8d06f132..00000000 --- a/testing/chromium/patches/0003-disable-autofill-download-manager.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- a/components/autofill/core/browser/autofill_download_manager.cc -+++ b/components/autofill/core/browser/autofill_download_manager.cc -@@ -703,70 +703,6 @@ AutofillDownloadManager::GetRequestURLAn - } - - bool AutofillDownloadManager::StartRequest(FormRequestData request_data) { -- scoped_refptr url_loader_factory = -- driver_->GetURLLoaderFactory(); -- DCHECK(url_loader_factory); -- -- // Get the URL and method to use for this request. -- std::string method; -- GURL request_url; -- std::tie(request_url, method) = -- UseApi() ? GetRequestURLAndMethodForApi(request_data) -- : GetRequestURLAndMethod(request_data); -- -- auto resource_request = std::make_unique(); -- resource_request->url = request_url; -- resource_request->load_flags = -- net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES; -- resource_request->method = method; -- -- // Add Chrome experiment state to the request headers. -- variations::AppendVariationsHeaderUnknownSignedIn( -- request_url, -- driver_->IsIncognito() ? variations::InIncognito::kYes -- : variations::InIncognito::kNo, -- resource_request.get()); -- -- // Set headers specific to the API if using it. -- if (UseApi()) -- // Encode response serialized proto in base64 for safety. -- resource_request->headers.SetHeader(kGoogEncodeResponseIfExecutable, -- "base64"); -- -- // Put API key in request's header if a key exists, and the endpoint is -- // trusted by Google. -- if (!api_key_.empty() && request_url.SchemeIs(url::kHttpsScheme) && -- google_util::IsGoogleAssociatedDomainUrl(request_url)) { -- resource_request->headers.SetHeader(kGoogApiKey, api_key_); -- } -- -- auto simple_loader = network::SimpleURLLoader::Create( -- std::move(resource_request), -- GetNetworkTrafficAnnotation(request_data.request_type)); -- -- // This allows reading the error message within the API response when status -- // is not 200 (e.g., 400). Otherwise, URL loader will not give any content in -- // the response when there is a failure, which makes debugging hard. -- simple_loader->SetAllowHttpErrorResults(true); -- -- if (method == "POST") { -- const std::string content_type = -- UseApi() ? "application/x-protobuf" : "text/proto"; -- // Attach payload data and add data format header. -- simple_loader->AttachStringForUpload(request_data.payload, content_type); -- } -- -- // Transfer ownership of the loader into url_loaders_. Temporarily hang -- // onto the raw pointer to use it as a key and to kick off the request; -- // transferring ownership (std::move) invalidates the |simple_loader| -- // variable. -- auto* raw_simple_loader = simple_loader.get(); -- url_loaders_.push_back(std::move(simple_loader)); -- raw_simple_loader->DownloadToStringOfUnboundedSizeUntilCrashAndDie( -- url_loader_factory.get(), -- base::BindOnce(&AutofillDownloadManager::OnSimpleLoaderComplete, -- base::Unretained(this), std::move(--url_loaders_.end()), -- std::move(request_data), base::TimeTicks::Now())); - return true; - } - diff --git a/testing/chromium/patches/0004-disable-google-url-tracker.patch b/testing/chromium/patches/0004-disable-google-url-tracker.patch deleted file mode 100644 index 0d46ade8..00000000 --- a/testing/chromium/patches/0004-disable-google-url-tracker.patch +++ /dev/null @@ -1,98 +0,0 @@ ---- a/components/google/core/browser/google_url_tracker.cc -+++ b/components/google/core/browser/google_url_tracker.cc -@@ -25,9 +25,9 @@ - #include "services/network/public/cpp/simple_url_loader.h" - - const char GoogleURLTracker::kDefaultGoogleHomepage[] = -- "https://www.google.com/"; -+ ""; - const char GoogleURLTracker::kSearchDomainCheckURL[] = -- "https://www.google.com/searchdomaincheck?format=domain&type=chrome"; -+ ""; - const base::Feature GoogleURLTracker::kNoSearchDomainCheck{ - "NoSearchDomainCheck", base::FEATURE_DISABLED_BY_DEFAULT}; - -@@ -148,83 +148,4 @@ void GoogleURLTracker::FinishSleep() { - } - - void GoogleURLTracker::StartLoadIfDesirable() { -- // Bail if a load isn't appropriate right now. This function will be called -- // again each time one of the preconditions changes, so we'll load -- // immediately once all of them are met. -- // -- // See comments in header on the class, on RequestServerCheck(), and on the -- // various members here for more detail on exactly what the conditions are. -- if (in_startup_sleep_ || already_loaded_ || !need_to_load_) -- return; -- -- // Some switches should disable the Google URL tracker entirely. If we can't -- // do background networking, we can't do the necessary load, and if the user -- // specified a Google base URL manually, we shouldn't bother to look up any -- // alternatives or offer to switch to them. -- if (!client_->IsBackgroundNetworkingEnabled() || -- base::CommandLine::ForCurrentProcess()->HasSwitch( -- switches::kGoogleBaseURL)) -- return; -- -- already_loaded_ = true; -- net::NetworkTrafficAnnotationTag traffic_annotation = -- net::DefineNetworkTrafficAnnotation("google_url_tracker", R"( -- semantics { -- sender: "Google URL Tracker" -- description: -- "When the user's default search engine is Google, or Google " -- "services are used to resolve navigation errors, the browser needs " -- "to know the ideal origin for requests to Google services. In " -- "these cases the browser makes a request to a global Google " -- "service that returns this origin, potentially taking into account " -- "the user's cookies or IP address." -- trigger: "Browser startup or network change." -- data: "None." -- destination: GOOGLE_OWNED_SERVICE -- } -- policy { -- cookies_allowed: YES -- cookies_store: "user" -- setting: -- "To disable this check, users can change the default search engine " -- "to something other than Google, and disable 'Use a web service to " -- "help resolve navigation errors' in Chromium's settings under " -- "Privacy.\nAlternately, running Chromium with " -- "--google-base-url=\"https://www.google.com/\" will disable this, " -- "and force Chromium to use the specified URL for Google service " -- "requests.\nFinally, running Chromium with " -- "--disable-background-networking will disable this, as well as " -- "various other features that make network requests automatically." -- policy_exception_justification: -- "Setting DefaultSearchProviderEnabled Chrome settings policy to " -- "false suffices as a way of setting the default search engine to " -- "not be Google. But there is no policy that controls navigation " -- "error resolution." -- })"); -- auto resource_request = std::make_unique(); -- resource_request->url = GURL(kSearchDomainCheckURL); -- // We don't want this load to set new entries in the cache or cookies, lest -- // we alarm the user. -- resource_request->load_flags = -- (net::LOAD_DISABLE_CACHE | net::LOAD_DO_NOT_SAVE_COOKIES); -- simple_loader_ = network::SimpleURLLoader::Create(std::move(resource_request), -- traffic_annotation); -- // Configure to retry at most kMaxRetries times for 5xx errors and network -- // changes. -- // A network change can propagate through Chrome in various stages, so it's -- // possible for this code to be reached via OnNetworkChanged(), and then have -- // the load we kick off be canceled due to e.g. the DNS server changing at a -- // later time. In general it's not possible to ensure that by the time we -- // reach here any requests we start won't be canceled in this fashion, so -- // retrying is the best we can do. -- static const int kMaxRetries = 5; -- simple_loader_->SetRetryOptions( -- kMaxRetries, -- network::SimpleURLLoader::RetryMode::RETRY_ON_5XX | -- network::SimpleURLLoader::RetryMode::RETRY_ON_NETWORK_CHANGE); -- simple_loader_->DownloadToString( -- client_->GetURLLoaderFactory(), -- base::BindOnce(&GoogleURLTracker::OnURLLoaderComplete, -- base::Unretained(this)), -- 2 * 1024 /* max_body_size */); - } diff --git a/testing/chromium/patches/0005-disable-default-extensions.patch b/testing/chromium/patches/0005-disable-default-extensions.patch deleted file mode 100644 index d40615e0..00000000 --- a/testing/chromium/patches/0005-disable-default-extensions.patch +++ /dev/null @@ -1,121 +0,0 @@ ---- a/chrome/browser/extensions/component_loader.cc -+++ b/chrome/browser/extensions/component_loader.cc -@@ -345,11 +345,6 @@ void ComponentLoader::AddWebStoreApp() { - if (!IsNormalSession()) - return; - #endif -- -- AddWithNameAndDescription( -- IDR_WEBSTORE_MANIFEST, base::FilePath(FILE_PATH_LITERAL("web_store")), -- l10n_util::GetStringUTF8(IDS_WEBSTORE_NAME_STORE), -- l10n_util::GetStringUTF8(IDS_WEBSTORE_APP_DESCRIPTION)); - } - - #if defined(OS_CHROMEOS) -@@ -447,11 +442,6 @@ void ComponentLoader::AddDefaultComponen - AddKeyboardApp(); - #else // defined(OS_CHROMEOS) - DCHECK(!skip_session_components); --#if BUILDFLAG(ENABLE_PRINTING) -- // Cloud Print component app. Not required on Chrome OS. -- Add(IDR_CLOUDPRINT_MANIFEST, -- base::FilePath(FILE_PATH_LITERAL("cloud_print"))); --#endif // BUILDFLAG(ENABLE_PRINTING) - #endif // defined(OS_CHROMEOS) - - if (!skip_session_components) { -@@ -536,12 +526,6 @@ void ComponentLoader::AddDefaultComponen - #if BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION) - AddHangoutServicesExtension(); - #endif // BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION) -- bool install_feedback = enable_background_extensions_during_testing; --#if defined(GOOGLE_CHROME_BUILD) -- install_feedback = true; --#endif // defined(GOOGLE_CHROME_BUILD) -- if (install_feedback) -- Add(IDR_FEEDBACK_MANIFEST, base::FilePath(FILE_PATH_LITERAL("feedback"))); - } - - #if defined(OS_CHROMEOS) ---- a/chrome/browser/extensions/external_component_loader.cc -+++ b/chrome/browser/extensions/external_component_loader.cc -@@ -29,9 +29,6 @@ ExternalComponentLoader::~ExternalCompon - - void ExternalComponentLoader::StartLoading() { - auto prefs = std::make_unique(); --#if defined(GOOGLE_CHROME_BUILD) -- AddExternalExtension(extension_misc::kInAppPaymentsSupportAppId, prefs.get()); --#endif // defined(GOOGLE_CHROME_BUILD) - - #if defined(OS_CHROMEOS) - { ---- a/chrome/browser/extensions/webstore_installer.cc -+++ b/chrome/browser/extensions/webstore_installer.cc -@@ -568,28 +568,6 @@ void WebstoreInstaller::DownloadNextPend - void WebstoreInstaller::DownloadCrx( - const std::string& extension_id, - InstallSource source) { -- download_url_ = GetWebstoreInstallURL(extension_id, source); -- MaybeAppendAuthUserParameter(approval_->authuser, &download_url_); -- -- base::FilePath user_data_dir; -- base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir); -- base::FilePath download_path = user_data_dir.Append(kWebstoreDownloadFolder); -- -- base::FilePath download_directory(g_download_directory_for_tests ? -- *g_download_directory_for_tests : download_path); -- --#if defined(OS_CHROMEOS) -- // Do not use drive for extension downloads. -- if (drive::util::IsUnderDriveMountPoint(download_directory)) { -- download_directory = DownloadPrefs::FromBrowserContext( -- profile_)->GetDefaultDownloadDirectoryForProfile(); -- } --#endif -- -- base::PostTaskAndReplyWithResult( -- GetExtensionFileTaskRunner().get(), FROM_HERE, -- base::BindOnce(&GetDownloadFilePath, download_directory, extension_id), -- base::BindOnce(&WebstoreInstaller::StartDownload, this, extension_id)); - } - - // http://crbug.com/165634 -@@ -735,28 +713,6 @@ void WebstoreInstaller::UpdateDownloadPr - } - - void WebstoreInstaller::StartCrxInstaller(const DownloadItem& download) { -- DCHECK_CURRENTLY_ON(BrowserThread::UI); -- DCHECK(!crx_installer_.get()); -- -- // The clock may be backward, e.g. daylight savings time just happenned. -- if (download.GetEndTime() >= download.GetStartTime()) { -- UMA_HISTOGRAM_TIMES("Extensions.WebstoreDownload.FileDownload", -- download.GetEndTime() - download.GetStartTime()); -- } -- ExtensionService* service = ExtensionSystem::Get(profile_)-> -- extension_service(); -- CHECK(service); -- -- const Approval* approval = GetAssociatedApproval(download); -- DCHECK(approval); -- -- crx_installer_ = download_crx_util::CreateCrxInstaller(profile_, download); -- -- crx_installer_->set_expected_id(approval->extension_id); -- crx_installer_->set_is_gallery_install(true); -- crx_installer_->set_allow_silent_install(true); -- -- crx_installer_->InstallCrx(download.GetFullPath()); - } - - void WebstoreInstaller::ReportFailure(const std::string& error, ---- a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc -+++ b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc -@@ -25,7 +25,6 @@ namespace extensions { - - bool IsComponentExtensionWhitelisted(const std::string& extension_id) { - const char* const kAllowed[] = { -- extension_misc::kInAppPaymentsSupportAppId, - extension_misc::kMediaRouterStableExtensionId, - extension_misc::kPdfExtensionId, - #if defined(OS_CHROMEOS) diff --git a/testing/chromium/patches/0006-modify-default-prefs.patch b/testing/chromium/patches/0006-modify-default-prefs.patch deleted file mode 100644 index 776ad42b..00000000 --- a/testing/chromium/patches/0006-modify-default-prefs.patch +++ /dev/null @@ -1,248 +0,0 @@ ---- a/chrome/browser/chrome_content_browser_client.cc -+++ b/chrome/browser/chrome_content_browser_client.cc -@@ -1125,7 +1125,7 @@ void ChromeContentBrowserClient::Registe - void ChromeContentBrowserClient::RegisterProfilePrefs( - user_prefs::PrefRegistrySyncable* registry) { - registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); -- registry->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing, true); -+ registry->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing, false); - registry->RegisterListPref(prefs::kEnableDeprecatedWebPlatformFeatures); - // Register user prefs for mapping SitePerProcess and IsolateOrigins in - // user policy in addition to the same named ones in Local State (which are ---- a/chrome/browser/ui/browser_ui_prefs.cc -+++ b/chrome/browser/ui/browser_ui_prefs.cc -@@ -66,11 +66,11 @@ void RegisterBrowserUserPrefs(user_prefs - registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true); - registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true); - registry->RegisterBooleanPref( -- prefs::kOfferTranslateEnabled, true, -+ prefs::kOfferTranslateEnabled, false, - user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); - registry->RegisterStringPref(prefs::kCloudPrintEmail, std::string()); - registry->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, true); -- registry->RegisterBooleanPref(prefs::kCloudPrintSubmitEnabled, true); -+ registry->RegisterBooleanPref(prefs::kCloudPrintSubmitEnabled, false); - registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacement); - registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacementPopup); - registry->RegisterDictionaryPref(prefs::kAppWindowPlacement); ---- a/chrome/browser/net/prediction_options.cc -+++ b/chrome/browser/net/prediction_options.cc -@@ -32,7 +32,7 @@ NetworkPredictionStatus CanPrefetchAndPr - } - return NetworkPredictionStatus::DISABLED_DUE_TO_NETWORK; - default: -- DCHECK_EQ(NETWORK_PREDICTION_NEVER, network_prediction_options); -+ //DCHECK_EQ(NETWORK_PREDICTION_NEVER, network_prediction_options); - return NetworkPredictionStatus::DISABLED_ALWAYS; - } - } ---- a/chrome/browser/net/prediction_options.h -+++ b/chrome/browser/net/prediction_options.h -@@ -23,7 +23,7 @@ enum NetworkPredictionOptions { - NETWORK_PREDICTION_ALWAYS, - NETWORK_PREDICTION_WIFI_ONLY, - NETWORK_PREDICTION_NEVER, -- NETWORK_PREDICTION_DEFAULT = NETWORK_PREDICTION_WIFI_ONLY, -+ NETWORK_PREDICTION_DEFAULT = NETWORK_PREDICTION_NEVER, - }; - - enum class NetworkPredictionStatus { ---- a/chrome/browser/background/background_mode_manager.cc -+++ b/chrome/browser/background/background_mode_manager.cc -@@ -352,7 +352,7 @@ void BackgroundModeManager::RegisterPref - registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false); - registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false); - #endif -- registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, true); -+ registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, false); - } - - void BackgroundModeManager::RegisterProfile(Profile* profile) { ---- a/components/content_settings/core/browser/cookie_settings.cc -+++ b/components/content_settings/core/browser/cookie_settings.cc -@@ -50,7 +50,7 @@ void CookieSettings::GetCookieSettings( - void CookieSettings::RegisterProfilePrefs( - user_prefs::PrefRegistrySyncable* registry) { - registry->RegisterBooleanPref( -- prefs::kBlockThirdPartyCookies, false, -+ prefs::kBlockThirdPartyCookies, true, - user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); - } - ---- a/chrome/browser/ui/navigation_correction_tab_observer.cc -+++ b/chrome/browser/ui/navigation_correction_tab_observer.cc -@@ -55,7 +55,7 @@ NavigationCorrectionTabObserver::~Naviga - // static - void NavigationCorrectionTabObserver::RegisterProfilePrefs( - user_prefs::PrefRegistrySyncable* prefs) { -- prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled, true, -+ prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled, false, - user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); - } - ---- a/components/autofill/core/common/autofill_prefs.cc -+++ b/components/autofill/core/common/autofill_prefs.cc -@@ -130,10 +130,10 @@ const char kAutocompleteLastVersionReten - void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { - // Synced prefs. Used for cross-device choices, e.g., credit card Autofill. - registry->RegisterBooleanPref( -- prefs::kAutofillEnabledDeprecated, true, -+ prefs::kAutofillEnabledDeprecated, false, - user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); - registry->RegisterBooleanPref( -- prefs::kAutofillProfileEnabled, true, -+ prefs::kAutofillProfileEnabled, false, - user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); - registry->RegisterIntegerPref( - prefs::kAutofillLastVersionDeduped, 0, -@@ -146,7 +146,7 @@ void RegisterProfilePrefs(user_prefs::Pr - prefs::kAutofillLastVersionDisusedAddressesDeleted, 0, - user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); - registry->RegisterBooleanPref( -- prefs::kAutofillCreditCardEnabled, true, -+ prefs::kAutofillCreditCardEnabled, false, - user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); - registry->RegisterStringPref( - prefs::kAutofillProfileValidity, "", ---- a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html -+++ b/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html -@@ -52,7 +52,7 @@ - - -
-- -+ - $i18nRaw{resetPageFeedback} -
- ---- a/chrome/browser/signin/signin_promo.cc -+++ b/chrome/browser/signin/signin_promo.cc -@@ -171,7 +171,7 @@ bool IsAutoCloseEnabledInEmbeddedURL(con - - void RegisterProfilePrefs( - user_prefs::PrefRegistrySyncable* registry) { -- registry->RegisterBooleanPref(prefs::kSignInPromoShowOnFirstRunAllowed, true); -+ registry->RegisterBooleanPref(prefs::kSignInPromoShowOnFirstRunAllowed, false); - registry->RegisterBooleanPref(prefs::kSignInPromoShowNTPBubble, false); - registry->RegisterIntegerPref(prefs::kDiceSigninUserMenuPromoCount, 0); - } ---- a/components/bookmarks/browser/bookmark_utils.cc -+++ b/components/bookmarks/browser/bookmark_utils.cc -@@ -440,12 +440,12 @@ void GetBookmarksMatchingProperties(Book - void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { - registry->RegisterBooleanPref( - prefs::kShowBookmarkBar, -- false, -+ true, - user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); - registry->RegisterBooleanPref(prefs::kEditBookmarksEnabled, true); - registry->RegisterBooleanPref( - prefs::kShowAppsShortcutInBookmarkBar, -- true, -+ false, - user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); - registry->RegisterBooleanPref( - prefs::kShowManagedBookmarksInBookmarkBar, ---- a/chrome/browser/profiles/profile.cc -+++ b/chrome/browser/profiles/profile.cc -@@ -148,7 +148,7 @@ const char Profile::kProfileKey[] = "__P - void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { - registry->RegisterBooleanPref( - prefs::kSearchSuggestEnabled, -- true, -+ false, - user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); - #if defined(OS_ANDROID) - registry->RegisterStringPref( ---- a/chrome/service/cloud_print/connector_settings.cc -+++ b/chrome/service/cloud_print/connector_settings.cc -@@ -60,7 +60,7 @@ void ConnectorSettings::InitFrom(Service - DCHECK(server_url_.is_valid()); - - connect_new_printers_ = prefs->GetBoolean( -- prefs::kCloudPrintConnectNewPrinters, true); -+ prefs::kCloudPrintConnectNewPrinters, false); - - xmpp_ping_enabled_ = prefs->GetBoolean( - prefs::kCloudPrintXmppPingEnabled, false); ---- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc -+++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc -@@ -127,10 +127,6 @@ void LocalDiscoveryUI::RegisterProfilePr - user_prefs::PrefRegistrySyncable* registry) { - registry->RegisterBooleanPref( - prefs::kLocalDiscoveryNotificationsEnabled, --#if defined(OS_WIN) - false, --#else -- true, --#endif - user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); - } ---- a/extensions/common/extension.cc -+++ b/extensions/common/extension.cc -@@ -382,14 +382,6 @@ bool Extension::ShouldDisplayInExtension - if (is_theme()) - return false; - -- // Hide component extensions because they are only extensions as an -- // implementation detail of Chrome. -- if (extensions::Manifest::IsComponentLocation(location()) && -- !base::CommandLine::ForCurrentProcess()->HasSwitch( -- switches::kShowComponentExtensionOptions)) { -- return false; -- } -- - // Unless they are unpacked, never show hosted apps. Note: We intentionally - // show packaged apps and platform apps because there are some pieces of - // functionality that are only available in chrome://extensions/ but which ---- a/components/safe_browsing/common/safe_browsing_prefs.cc -+++ b/components/safe_browsing/common/safe_browsing_prefs.cc -@@ -149,9 +149,9 @@ void RegisterProfilePrefs(PrefRegistrySi - registry->RegisterBooleanPref( - prefs::kSafeBrowsingSawInterstitialScoutReporting, false); - registry->RegisterBooleanPref( -- prefs::kSafeBrowsingExtendedReportingOptInAllowed, true); -+ prefs::kSafeBrowsingExtendedReportingOptInAllowed, false); - registry->RegisterBooleanPref( -- prefs::kSafeBrowsingEnabled, true, -+ prefs::kSafeBrowsingEnabled, false, - user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); - registry->RegisterBooleanPref(prefs::kSafeBrowsingProceedAnywayDisabled, - false); ---- a/components/password_manager/core/browser/password_manager.cc -+++ b/components/password_manager/core/browser/password_manager.cc -@@ -354,10 +354,10 @@ bool IsOnlyNewParserEnabled() { - void PasswordManager::RegisterProfilePrefs( - user_prefs::PrefRegistrySyncable* registry) { - registry->RegisterBooleanPref( -- prefs::kCredentialsEnableService, true, -+ prefs::kCredentialsEnableService, false, - user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF); - registry->RegisterBooleanPref( -- prefs::kCredentialsEnableAutosignin, true, -+ prefs::kCredentialsEnableAutosignin, false, - user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF); - registry->RegisterStringPref(prefs::kSyncPasswordHash, std::string(), - PrefRegistry::NO_REGISTRATION_FLAGS); ---- a/components/payments/core/payment_prefs.cc -+++ b/components/payments/core/payment_prefs.cc -@@ -16,7 +16,7 @@ const char kCanMakePaymentEnabled[] = "p - void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { - registry->RegisterBooleanPref(kPaymentsFirstTransactionCompleted, false); - registry->RegisterBooleanPref( -- kCanMakePaymentEnabled, true, -+ kCanMakePaymentEnabled, false, - user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); - } - ---- a/chrome/browser/signin/account_consistency_mode_manager.cc -+++ b/chrome/browser/signin/account_consistency_mode_manager.cc -@@ -126,7 +126,7 @@ void AccountConsistencyModeManager::Regi - registry->RegisterBooleanPref(prefs::kAccountConsistencyMirrorRequired, - false); - #endif -- registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, true); -+ registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, false); - } - - // static diff --git a/testing/chromium/patches/0007-disable-web-resource-service.patch b/testing/chromium/patches/0007-disable-web-resource-service.patch deleted file mode 100644 index a3b7f06f..00000000 --- a/testing/chromium/patches/0007-disable-web-resource-service.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- a/components/web_resource/web_resource_service.cc -+++ b/components/web_resource/web_resource_service.cc -@@ -128,48 +128,7 @@ bool WebResourceService::GetFetchSchedul - // Initializes the fetching of data from the resource server. Data - // load calls OnSimpleLoaderComplete. - void WebResourceService::StartFetch() { -- // Set to false so that next fetch can be scheduled after this fetch or -- // if we receive notification that resource is allowed. -- fetch_scheduled_ = false; -- // Check whether fetching is allowed. -- if (!resource_request_allowed_notifier_->ResourceRequestsAllowed()) -- return; -- -- // First, put our next cache load on the MessageLoop. -- ScheduleFetch(cache_update_delay_ms_); -- -- // Set cache update time in preferences. -- prefs_->SetString(last_update_time_pref_name_, -- base::NumberToString(base::Time::Now().ToDoubleT())); -- -- // If we are still fetching data, exit. -- if (in_fetch_) -- return; -- in_fetch_ = true; -- -- GURL web_resource_server = -- application_locale_.empty() -- ? web_resource_server_ -- : google_util::AppendGoogleLocaleParam(web_resource_server_, -- application_locale_); -- -- DVLOG(1) << "WebResourceService StartFetch " << web_resource_server; -- auto resource_request = std::make_unique(); -- resource_request->url = web_resource_server; -- // Do not let url fetcher affect existing state in system context -- // (by setting cookies, for example). -- resource_request->load_flags = net::LOAD_DISABLE_CACHE | -- net::LOAD_DO_NOT_SEND_COOKIES | -- net::LOAD_DO_NOT_SAVE_COOKIES; -- // TODO(https://crbug.com/808498): Re-add data use measurement once -- // SimpleURLLoader supports it. -- // ID=data_use_measurement::DataUseUserData::WEB_RESOURCE_SERVICE -- simple_url_loader_ = network::SimpleURLLoader::Create( -- std::move(resource_request), traffic_annotation_); -- simple_url_loader_->DownloadToStringOfUnboundedSizeUntilCrashAndDie( -- url_loader_factory_.get(), -- base::BindOnce(&WebResourceService::OnSimpleLoaderComplete, -- base::Unretained(this))); -+ in_fetch_ = false; - } - - void WebResourceService::EndFetch() { diff --git a/testing/chromium/patches/0008-restore-classic-ntp.patch b/testing/chromium/patches/0008-restore-classic-ntp.patch deleted file mode 100644 index c474e1c0..00000000 --- a/testing/chromium/patches/0008-restore-classic-ntp.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- a/chrome/browser/search/search.cc -+++ b/chrome/browser/search/search.cc -@@ -196,29 +196,7 @@ struct NewTabURLDetails { - - const GURL local_url(chrome::kChromeSearchLocalNtpUrl); - -- if (ShouldShowLocalNewTab(profile)) -- return NewTabURLDetails(local_url, NEW_TAB_URL_VALID); -- -- const TemplateURL* template_url = -- GetDefaultSearchProviderTemplateURL(profile); -- if (!profile || !template_url) -- return NewTabURLDetails(local_url, NEW_TAB_URL_BAD); -- -- GURL search_provider_url(template_url->new_tab_url_ref().ReplaceSearchTerms( -- TemplateURLRef::SearchTermsArgs(base::string16()), -- UIThreadSearchTermsData(profile))); -- -- if (ShouldDelayRemoteNTP(search_provider_url, profile)) -- return NewTabURLDetails(local_url, NEW_TAB_URL_VALID); -- -- if (!search_provider_url.is_valid()) -- return NewTabURLDetails(local_url, NEW_TAB_URL_NOT_SET); -- if (!search_provider_url.SchemeIsCryptographic()) -- return NewTabURLDetails(local_url, NEW_TAB_URL_INSECURE); -- if (!IsURLAllowedForSupervisedUser(search_provider_url, profile)) -- return NewTabURLDetails(local_url, NEW_TAB_URL_BLOCKED); -- -- return NewTabURLDetails(search_provider_url, NEW_TAB_URL_VALID); -+ return NewTabURLDetails(local_url, NEW_TAB_URL_VALID); - } - - const GURL url; ---- a/components/ntp_snippets/features.cc -+++ b/components/ntp_snippets/features.cc -@@ -41,7 +41,7 @@ const base::Feature* const kAllFeatures[ - &kRemoteSuggestionsBackendFeature}; - - const base::Feature kArticleSuggestionsFeature{ -- "NTPArticleSuggestions", base::FEATURE_ENABLED_BY_DEFAULT}; -+ "NTPArticleSuggestions", base::FEATURE_DISABLED_BY_DEFAULT}; - - const base::Feature kRemoteSuggestionsEmulateM58FetchingSchedule{ - "RemoteSuggestionsEmulateM58FetchingSchedule", -@@ -71,7 +71,7 @@ const char kNotificationsDailyLimit[] = - const char kNotificationsIgnoredLimitParam[] = "ignored_limit"; - - const base::Feature kKeepPrefetchedContentSuggestions{ -- "KeepPrefetchedContentSuggestions", base::FEATURE_ENABLED_BY_DEFAULT}; -+ "KeepPrefetchedContentSuggestions", base::FEATURE_DISABLED_BY_DEFAULT}; - - const base::Feature kContentSuggestionsDebugLog{ - "ContentSuggestionsDebugLog", base::FEATURE_DISABLED_BY_DEFAULT}; diff --git a/testing/chromium/patches/0009-disable-google-ipv6-probes.patch b/testing/chromium/patches/0009-disable-google-ipv6-probes.patch deleted file mode 100644 index f1a1dd99..00000000 --- a/testing/chromium/patches/0009-disable-google-ipv6-probes.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/net/dns/host_resolver_manager.cc -+++ b/net/dns/host_resolver_manager.cc -@@ -120,10 +120,10 @@ const unsigned kMinimumTTLSeconds = kCac - // cached. - const int kIPv6ProbePeriodMs = 1000; - --// Google DNS address used for IPv6 probes. --const uint8_t kIPv6ProbeAddress[] = {0x20, 0x01, 0x48, 0x60, 0x48, 0x60, -+// RIPE NCC k.root-servers.net. 2001:7fd::1 (anycasted), used for IPv6 probes. -+const uint8_t kIPv6ProbeAddress[] = {0x20, 0x01, 0x07, 0xfd, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -- 0x00, 0x00, 0x88, 0x88}; -+ 0x00, 0x00, 0x00, 0x01}; - - enum DnsResolveStatus { - RESOLVE_STATUS_DNS_SUCCESS = 0, diff --git a/testing/chromium/patches/0010-disable-gcm-status-check.patch b/testing/chromium/patches/0010-disable-gcm-status-check.patch deleted file mode 100644 index 4c88072c..00000000 --- a/testing/chromium/patches/0010-disable-gcm-status-check.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- a/components/gcm_driver/gcm_channel_status_request.cc -+++ b/components/gcm_driver/gcm_channel_status_request.cc -@@ -24,8 +24,6 @@ namespace gcm { - - namespace { - --const char kRequestContentType[] = "application/octet-stream"; --const char kGCMChannelTag[] = "gcm_channel"; - const int kDefaultPollIntervalSeconds = 60 * 60; // 60 minutes. - const int kMinPollIntervalSeconds = 30 * 60; // 30 minutes. - -@@ -57,73 +55,8 @@ int GCMChannelStatusRequest::min_poll_in - } - - void GCMChannelStatusRequest::Start() { -- // url_loader_factory_ can be null for tests. -- if (!url_loader_factory_) -- return; -- -- DCHECK(!simple_url_loader_); -- -- GURL request_url(channel_status_request_url_); -- -- sync_pb::ExperimentStatusRequest proto_data; -- proto_data.add_experiment_name(kGCMChannelTag); -- std::string upload_data; -- if (!proto_data.SerializeToString(&upload_data)) { -- NOTREACHED(); -- } -- -- net::NetworkTrafficAnnotationTag traffic_annotation = -- net::DefineNetworkTrafficAnnotation("gcm_channel_status_request", R"( -- semantics { -- sender: "GCM Driver" -- description: -- "Google Chrome interacts with Google Cloud Messaging to receive " -- "push messages for various browser features, as well as on behalf " -- "of websites and extensions. The channel status request " -- "periodically confirms with Google servers whether the feature " -- "should be enabled." -- trigger: -- "Periodically when Chrome has established an active Google Cloud " -- "Messaging subscription. The first request will be issued a minute " -- "after the first subscription activates. Subsequent requests will " -- "be issued each hour with a jitter of 15 minutes. Google can " -- "adjust this interval when it deems necessary." -- data: -- "A user agent string containing the Chrome version, channel and " -- "platform will be sent to the server. No user identifier is sent " -- "along with the request." -- destination: GOOGLE_OWNED_SERVICE -- } -- policy { -- cookies_allowed: NO -- setting: -- "Support for interacting with Google Cloud Messaging is enabled by " -- "default, and there is no configuration option to completely " -- "disable it. Websites wishing to receive push messages must " -- "acquire express permission from the user for the 'Notification' " -- "permission." -- policy_exception_justification: -- "Not implemented, considered not useful." -- })"); -- -- auto resource_request = std::make_unique(); -- -- resource_request->url = request_url; -- resource_request->load_flags = -- net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES; -- resource_request->method = "POST"; -- resource_request->headers.SetHeader(net::HttpRequestHeaders::kUserAgent, -- user_agent_); -- // TODO(https://crbug.com/808498): Re-add data use measurement once -- // SimpleURLLoader supports it. -- // ID=data_use_measurement::DataUseUserData::GCM_DRIVER -- simple_url_loader_ = network::SimpleURLLoader::Create( -- std::move(resource_request), traffic_annotation); -- simple_url_loader_->AttachStringForUpload(upload_data, kRequestContentType); -- simple_url_loader_->DownloadToStringOfUnboundedSizeUntilCrashAndDie( -- url_loader_factory_.get(), -- base::BindOnce(&GCMChannelStatusRequest::OnSimpleLoaderComplete, -- base::Unretained(this))); -+ // Simulate an empty response and disable GCM. -+ callback_.Run(false, false, 0); - } - - void GCMChannelStatusRequest::OnSimpleLoaderComplete( diff --git a/testing/chromium/patches/0014-disable-translation-lang-fetch.patch b/testing/chromium/patches/0014-disable-translation-lang-fetch.patch deleted file mode 100644 index 76951fb7..00000000 --- a/testing/chromium/patches/0014-disable-translation-lang-fetch.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- a/components/translate/core/browser/translate_language_list.cc -+++ b/components/translate/core/browser/translate_language_list.cc -@@ -207,6 +207,8 @@ GURL TranslateLanguageList::TranslateLan - } - - void TranslateLanguageList::RequestLanguageList() { -+ return; -+ - // If resource requests are not allowed, we'll get a callback when they are. - if (!resource_requests_allowed_) { - request_pending_ = true; ---- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc -+++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc -@@ -167,7 +167,6 @@ void SpellcheckHunspellDictionary::Retry - return; - } - browser_context_ = browser_context; -- DownloadDictionary(GetDictionaryURL()); - } - - bool SpellcheckHunspellDictionary::IsReady() const { -@@ -406,9 +405,6 @@ void SpellcheckHunspellDictionary::Initi - } - - if (browser_context_) { -- // Download from the UI thread to check that |browser_context_| is -- // still valid. -- DownloadDictionary(GetDictionaryURL()); - return; - } - } ---- a/components/translate/core/browser/translate_ranker_impl.cc -+++ b/components/translate/core/browser/translate_ranker_impl.cc -@@ -157,14 +157,10 @@ TranslateRankerImpl::TranslateRankerImpl - ukm::UkmRecorder* ukm_recorder) - : ukm_recorder_(ukm_recorder), - is_logging_enabled_(false), -- is_query_enabled_(base::FeatureList::IsEnabled(kTranslateRankerQuery)), -- is_enforcement_enabled_( -- base::FeatureList::IsEnabled(kTranslateRankerEnforcement)), -- is_auto_blacklist_override_enabled_(base::FeatureList::IsEnabled( -- translate::kTranslateRankerAutoBlacklistOverride)), -- is_previous_language_matches_override_enabled_( -- base::FeatureList::IsEnabled( -- translate::kTranslateRankerPreviousLanguageMatchesOverride)), -+ is_query_enabled_(false), -+ is_enforcement_enabled_(false), -+ is_auto_blacklist_override_enabled_(false), -+ is_previous_language_matches_override_enabled_(false), - weak_ptr_factory_(this) { - if (is_query_enabled_ || is_enforcement_enabled_) { - model_loader_ = std::make_unique( -@@ -238,6 +234,8 @@ bool TranslateRankerImpl::ShouldOfferTra - // (or become False). - const bool kDefaultResponse = true; - -+ return kDefaultResponse; -+ - translate_event->set_ranker_request_timestamp_sec( - (base::TimeTicks::Now() - base::TimeTicks()).InSeconds()); - translate_event->set_ranker_version(GetModelVersion()); diff --git a/testing/chromium/patches/0015-disable-update-pings.patch b/testing/chromium/patches/0015-disable-update-pings.patch deleted file mode 100644 index 15c11b60..00000000 --- a/testing/chromium/patches/0015-disable-update-pings.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/components/component_updater/configurator_impl.cc -+++ b/components/component_updater/configurator_impl.cc -@@ -73,14 +73,7 @@ int ConfiguratorImpl::UpdateDelay() cons - } - - std::vector ConfiguratorImpl::UpdateUrl() const { -- if (url_source_override_.is_valid()) -- return {GURL(url_source_override_)}; -- -- std::vector urls{GURL(kUpdaterJSONDefaultUrl), -- GURL(kUpdaterJSONFallbackUrl)}; -- if (require_encryption_) -- update_client::RemoveUnsecureUrls(&urls); -- -+ std::vector urls; - return urls; - } - diff --git a/testing/chromium/patches/0019-disable-battery-status-service.patch b/testing/chromium/patches/0019-disable-battery-status-service.patch deleted file mode 100644 index 5f3efda5..00000000 --- a/testing/chromium/patches/0019-disable-battery-status-service.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- a/services/device/battery/battery_status_service.cc -+++ b/services/device/battery/battery_status_service.cc -@@ -19,10 +19,7 @@ BatteryStatusService::BatteryStatusServi - : main_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()), - update_callback_(base::Bind(&BatteryStatusService::NotifyConsumers, - base::Unretained(this))), -- status_updated_(false), - is_shutdown_(false) { -- callback_list_.set_removal_callback(base::Bind( -- &BatteryStatusService::ConsumersChanged, base::Unretained(this))); - } - - BatteryStatusService::~BatteryStatusService() {} -@@ -38,58 +35,16 @@ BatteryStatusService::AddCallback(const - DCHECK(main_thread_task_runner_->BelongsToCurrentThread()); - DCHECK(!is_shutdown_); - -- if (!battery_fetcher_) -- battery_fetcher_ = BatteryStatusManager::Create(update_callback_); -- -- if (callback_list_.empty()) { -- bool success = battery_fetcher_->StartListeningBatteryChange(); -- // On failure pass the default values back. -- if (!success) -- callback.Run(mojom::BatteryStatus()); -- } -- -- if (status_updated_) { -- // Send recent status to the new callback if already available. -- callback.Run(status_); -- } -+ // Always pass the default values. -+ callback.Run(mojom::BatteryStatus()); - - return callback_list_.Add(callback); - } - --void BatteryStatusService::ConsumersChanged() { -- if (is_shutdown_) -- return; -- -- if (callback_list_.empty()) { -- battery_fetcher_->StopListeningBatteryChange(); -- status_updated_ = false; -- } --} -- - void BatteryStatusService::NotifyConsumers(const mojom::BatteryStatus& status) { -- DCHECK(!is_shutdown_); -- -- main_thread_task_runner_->PostTask( -- FROM_HERE, -- base::BindOnce(&BatteryStatusService::NotifyConsumersOnMainThread, -- base::Unretained(this), status)); --} -- --void BatteryStatusService::NotifyConsumersOnMainThread( -- const mojom::BatteryStatus& status) { -- DCHECK(main_thread_task_runner_->BelongsToCurrentThread()); -- if (callback_list_.empty()) -- return; -- -- status_ = status; -- status_updated_ = true; -- callback_list_.Notify(status_); - } - - void BatteryStatusService::Shutdown() { -- if (!callback_list_.empty()) -- battery_fetcher_->StopListeningBatteryChange(); -- battery_fetcher_.reset(); - is_shutdown_ = true; - } - -@@ -100,9 +55,6 @@ BatteryStatusService::GetUpdateCallbackF - - void BatteryStatusService::SetBatteryManagerForTesting( - std::unique_ptr test_battery_manager) { -- battery_fetcher_ = std::move(test_battery_manager); -- status_ = mojom::BatteryStatus(); -- status_updated_ = false; - is_shutdown_ = false; - main_thread_task_runner_ = base::ThreadTaskRunnerHandle::Get(); - } ---- a/services/device/battery/battery_status_service.h -+++ b/services/device/battery/battery_status_service.h -@@ -56,15 +56,10 @@ class BatteryStatusService { - // Updates current battery status and sends new status to interested - // render processes. Can be called on any thread via a callback. - void NotifyConsumers(const mojom::BatteryStatus& status); -- void NotifyConsumersOnMainThread(const mojom::BatteryStatus& status); -- void ConsumersChanged(); - - scoped_refptr main_thread_task_runner_; -- std::unique_ptr battery_fetcher_; - BatteryUpdateCallbackList callback_list_; - BatteryUpdateCallback update_callback_; -- mojom::BatteryStatus status_; -- bool status_updated_; - bool is_shutdown_; - - DISALLOW_COPY_AND_ASSIGN(BatteryStatusService); diff --git a/testing/chromium/patches/0021-disable-rlz.patch b/testing/chromium/patches/0021-disable-rlz.patch deleted file mode 100644 index 38e5210d..00000000 --- a/testing/chromium/patches/0021-disable-rlz.patch +++ /dev/null @@ -1,12 +0,0 @@ -# Disable rlz - ---- a/rlz/buildflags/buildflags.gni -+++ b/rlz/buildflags/buildflags.gni -@@ -6,6 +6,6 @@ import("//build/config/chrome_build.gni" - - # Whether we are using the rlz library or not. Platforms like Android send - # rlz codes for searches but do not use the library. --enable_rlz_support = is_win || is_mac || is_ios || is_chromeos -+enable_rlz_support = false - - enable_rlz = is_chrome_branded && enable_rlz_support diff --git a/testing/chromium/patches/android.patch b/testing/chromium/patches/android.patch deleted file mode 100644 index 8a4e803a..00000000 --- a/testing/chromium/patches/android.patch +++ /dev/null @@ -1,24 +0,0 @@ -description: disable dependency on chrome/android -author: Michael Gilbert - ---- a/device/vr/buildflags/buildflags.gni -+++ b/device/vr/buildflags/buildflags.gni -@@ -5,7 +5,6 @@ - import("//build/config/chrome_build.gni") - import("//build/config/chromecast_build.gni") - import("//build/config/gclient_args.gni") --import("//chrome/android/channel.gni") - - declare_args() { - enable_gvr_services = is_android && !is_chromecast && ---- a/BUILD.gn -+++ b/BUILD.gn -@@ -371,7 +371,7 @@ group("gn_all") { - # seems currently broken for this platform at the moment, and the - # corresponding code build and works on Linux unmodified. - # See instructions in the corresponding BUILD.gn. -- if (is_linux) { -+ if (is_android) { - deps += - [ "//third_party/android_crazy_linker:android_crazy_linker_zip_fuzzer" ] - } diff --git a/testing/chromium/patches/chromium-75-fix-gn-gen.patch b/testing/chromium/patches/chromium-75-fix-gn-gen.patch deleted file mode 100644 index a6a98b16..00000000 --- a/testing/chromium/patches/chromium-75-fix-gn-gen.patch +++ /dev/null @@ -1,27 +0,0 @@ -Fix 'gn gen' when gn is built in debug config - -Fixes this DCHECK: -https://cs.chromium.org/chromium/gn/tools/gn/source_file.cc?q=source_file.cc&sq=package:chromium&dr&l=21 - -BUG=None - -Change-Id: Ide60a650c800d4a0981b4f28cf0427fa91616464 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1613888 -Reviewed-by: Brian Sheedy -Commit-Queue: Brian Sheedy -Commit-Queue: Thomas Anderson -Auto-Submit: Thomas Anderson -Cr-Commit-Position: refs/heads/master@{#660103} -diff --git a/tools/perf/contrib/vr_benchmarks/BUILD.gn b/tools/perf/contrib/vr_benchmarks/BUILD.gn -index 758057a..51644e0 100644 ---- a/tools/perf/contrib/vr_benchmarks/BUILD.gn -+++ b/tools/perf/contrib/vr_benchmarks/BUILD.gn -@@ -72,7 +72,7 @@ - "//chrome/browser/resources/vr/assets/vr_assets_component_files.json", - ] - outputs = [ -- "$target_gen_dir/vr_assets_profile/", -+ "$target_gen_dir/vr_assets_profile", - ] - args = [ - "--output", diff --git a/testing/chromium/patches/chromium-75-gcc-angle-fix.patch b/testing/chromium/patches/chromium-75-gcc-angle-fix.patch deleted file mode 100644 index 58447d73..00000000 --- a/testing/chromium/patches/chromium-75-gcc-angle-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/third_party/angle/src/common/debug.h 2019-06-02 17:59:16.698392030 -0000 -+++ b/third_party/angle/src/common/debug.h 2019-06-02 17:59:48.738265672 -0000 -@@ -248,7 +248,7 @@ - # define EVENT(message, ...) (void(0)) - #endif - --#if defined(COMPILER_GCC) || defined(__clang__) -+#if defined(__GNUC__) || defined(__clang__) - # define ANGLE_CRASH() __builtin_trap() - #else - # define ANGLE_CRASH() ((void)(*(volatile char *)0 = 0)), __assume(0) -@@ -336,7 +336,7 @@ - # define ANGLE_ENABLE_STRUCT_PADDING_WARNINGS \ - _Pragma("clang diagnostic push") _Pragma("clang diagnostic error \"-Wpadded\"") - # define ANGLE_DISABLE_STRUCT_PADDING_WARNINGS _Pragma("clang diagnostic pop") --#elif defined(COMPILER_GCC) -+#elif defined(__GNUC__) - # define ANGLE_ENABLE_STRUCT_PADDING_WARNINGS \ - _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic error \"-Wpadded\"") - # define ANGLE_DISABLE_STRUCT_PADDING_WARNINGS _Pragma("GCC diagnostic pop") diff --git a/testing/chromium/patches/chromium-75-llvm8.patch b/testing/chromium/patches/chromium-75-llvm8.patch deleted file mode 100644 index f2144568..00000000 --- a/testing/chromium/patches/chromium-75-llvm8.patch +++ /dev/null @@ -1,17 +0,0 @@ -Issue 945938: Build fails with clang/llvm-8 -https://bugs.chromium.org/p/chromium/issues/detail?id=945938&q=TabStripModelChange&colspec=ID%20Pri%20M%20Stars%20ReleaseBlock%20Component%20Status%20Owner%20Summary%20OS%20Modified - -diff --git a/chrome/browser/ui/tabs/tab_strip_model_observer.h b/chrome/browser/ui/tabs/tab_strip_model_observer.h -index 6c8bce5..7f67b7d 100644 ---- a/chrome/browser/ui/tabs/tab_strip_model_observer.h -+++ b/chrome/browser/ui/tabs/tab_strip_model_observer.h -@@ -135,7 +135,7 @@ class TabStripModelChange { - - private: - const Type type_ = kSelectionOnly; -- const std::vector deltas_; -+ std::vector deltas_; - - DISALLOW_COPY_AND_ASSIGN(TabStripModelChange); - }; - diff --git a/testing/chromium/patches/chromium-75-lss.patch b/testing/chromium/patches/chromium-75-lss.patch deleted file mode 100644 index feeeaee8..00000000 --- a/testing/chromium/patches/chromium-75-lss.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- a/third_party/lss/BUILD.gn -+++ b/third_party/lss/BUILD.gn -@@ -0,0 +1,31 @@ -+# Copyright 2019 The Crashpad Authors. All rights reserved. -+# -+# Licensed under the Apache License, Version 2.0 (the "License"); -+# you may not use this file except in compliance with the License. -+# You may obtain a copy of the License at -+# -+# http://www.apache.org/licenses/LICENSE-2.0 -+# -+# Unless required by applicable law or agreed to in writing, software -+# distributed under the License is distributed on an "AS IS" BASIS, -+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+# See the License for the specific language governing permissions and -+# limitations under the License. -+ -+import("../../build/crashpad_buildconfig.gni") -+ -+config("lss_config") { -+ if (crashpad_is_in_chromium) { -+ defines = [ "CRASHPAD_LSS_SOURCE_EXTERNAL" ] -+ } else { -+ defines = [ "CRASHPAD_LSS_SOURCE_EMBEDDED" ] -+ } -+} -+ -+source_set("lss") { -+ public_configs = [ ":lss_config" ] -+ -+ sources = [ -+ "lss.h", -+ ] -+} ---- a/third_party/lss/lss.h -+++ b/third_party/lss/lss.h -@@ -0,0 +1,26 @@ -+// Copyright 2019 The Crashpad Authors. All rights reserved. -+// -+// Licensed under the Apache License, Version 2.0 (the "License"); -+// you may not use this file except in compliance with the License. -+// You may obtain a copy of the License at -+// -+// http://www.apache.org/licenses/LICENSE-2.0 -+// -+// Unless required by applicable law or agreed to in writing, software -+// distributed under the License is distributed on an "AS IS" BASIS, -+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+// See the License for the specific language governing permissions and -+// limitations under the License. -+ -+#ifndef CRASHPAD_THIRD_PARTY_LSS_LSS_H_ -+#define CRASHPAD_THIRD_PARTY_LSS_LSS_H_ -+ -+#if defined(CRASHPAD_LSS_SOURCE_EXTERNAL) -+#include "third_party/lss/linux_syscall_support.h" -+#elif defined(CRASHPAD_LSS_SOURCE_EMBEDDED) -+#include "third_party/lss/lss/linux_syscall_support.h" -+#else -+#error Unknown lss source -+#endif -+ -+#endif // CRASHPAD_THIRD_PARTY_LSS_LSS_H_ diff --git a/testing/chromium/patches/chromium-75-noexcept.patch b/testing/chromium/patches/chromium-75-noexcept.patch deleted file mode 100644 index bcac1c27..00000000 --- a/testing/chromium/patches/chromium-75-noexcept.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 41d954dec0669c9a85730c0bde7df7ba7a0ff43e Mon Sep 17 00:00:00 2001 -From: Jose Dapena Paz -Date: Thu, 06 Jun 2019 15:30:49 +0000 -Subject: [PATCH] Fix AutocompleteMatch move constructor/assign operator noexcept - -For AutocompleteMatch to declare noexcept them, all the contained -properties need to be noexcept too. This is required at least -for SuggestionAnswer, because base::string16 will make default -calculated signature of the move operator noexcept(false). - -To avoid this issue we explicitely declare them on SuggestionAnswer, -and its member classes TextField and ImageLine. - -Bug: 819294 -Change-Id: I8714f2c6352a3292bdebdc3aed9790270e49c580 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1554669 -Reviewed-by: Kevin Bailey -Commit-Queue: José Dapena Paz -Cr-Commit-Position: refs/heads/master@{#666714} ---- - -diff --git a/components/omnibox/browser/suggestion_answer.cc b/components/omnibox/browser/suggestion_answer.cc -index 151e55f..a0c9049 100644 ---- a/components/omnibox/browser/suggestion_answer.cc -+++ b/components/omnibox/browser/suggestion_answer.cc -@@ -55,6 +55,12 @@ - - SuggestionAnswer::TextField::TextField() = default; - SuggestionAnswer::TextField::~TextField() = default; -+SuggestionAnswer::TextField::TextField(const TextField&) = default; -+SuggestionAnswer::TextField::TextField(TextField&&) noexcept = default; -+SuggestionAnswer::TextField& SuggestionAnswer::TextField::operator=( -+ const TextField&) = default; -+SuggestionAnswer::TextField& SuggestionAnswer::TextField::operator=( -+ TextField&&) noexcept = default; - - // static - bool SuggestionAnswer::TextField::ParseTextField(const base::Value& field_json, -@@ -93,9 +99,12 @@ - SuggestionAnswer::ImageLine::ImageLine() - : num_text_lines_(1) {} - SuggestionAnswer::ImageLine::ImageLine(const ImageLine& line) = default; -+SuggestionAnswer::ImageLine::ImageLine(ImageLine&&) noexcept = default; - - SuggestionAnswer::ImageLine& SuggestionAnswer::ImageLine::operator=( - const ImageLine& line) = default; -+SuggestionAnswer::ImageLine& SuggestionAnswer::ImageLine::operator=( -+ ImageLine&&) noexcept = default; - - SuggestionAnswer::ImageLine::~ImageLine() {} - -@@ -251,9 +260,14 @@ - - SuggestionAnswer::SuggestionAnswer(const SuggestionAnswer& answer) = default; - -+SuggestionAnswer::SuggestionAnswer(SuggestionAnswer&&) noexcept = default; -+ - SuggestionAnswer& SuggestionAnswer::operator=(const SuggestionAnswer& answer) = - default; - -+SuggestionAnswer& SuggestionAnswer::operator=(SuggestionAnswer&&) noexcept = -+ default; -+ - SuggestionAnswer::~SuggestionAnswer() = default; - - // static -diff --git a/components/omnibox/browser/suggestion_answer.h b/components/omnibox/browser/suggestion_answer.h -index 31be937..2840ace 100644 ---- a/components/omnibox/browser/suggestion_answer.h -+++ b/components/omnibox/browser/suggestion_answer.h -@@ -125,6 +125,10 @@ - public: - TextField(); - ~TextField(); -+ TextField(const TextField&); -+ TextField(TextField&&) noexcept; -+ TextField& operator=(const TextField&); -+ TextField& operator=(TextField&&) noexcept; - - // Parses |field_json| dictionary and populates |text_field| with the - // contents. If any of the required elements is missing, returns false and -@@ -162,7 +166,9 @@ - public: - ImageLine(); - explicit ImageLine(const ImageLine& line); -+ ImageLine(ImageLine&&) noexcept; - ImageLine& operator=(const ImageLine& line); -+ ImageLine& operator=(ImageLine&&) noexcept; - ~ImageLine(); - - // Parses dictionary |line_json| and populates |image_line| with the -@@ -213,7 +219,9 @@ - - SuggestionAnswer(); - SuggestionAnswer(const SuggestionAnswer& answer); -+ SuggestionAnswer(SuggestionAnswer&&) noexcept; - SuggestionAnswer& operator=(const SuggestionAnswer& answer); -+ SuggestionAnswer& operator=(SuggestionAnswer&&) noexcept; - ~SuggestionAnswer(); - - // Parses dictionary |answer_json| and fills a SuggestionAnswer containing the diff --git a/testing/chromium/patches/chromium-75-pure-virtual.patch b/testing/chromium/patches/chromium-75-pure-virtual.patch deleted file mode 100644 index 3d34e436..00000000 --- a/testing/chromium/patches/chromium-75-pure-virtual.patch +++ /dev/null @@ -1,50 +0,0 @@ -From cdf306db81efaaaa954487585d5a5a16205a5ebd Mon Sep 17 00:00:00 2001 -From: Jose Dapena Paz -Date: Wed, 05 Jun 2019 14:45:06 +0000 -Subject: [PATCH] Avoid pure virtual crash destroying RenderProcessUserData - -When RenderProcessUserData is destroyed from the destructor of -RenderProcessHostImpl, it is done in the destructor of RenderProcessHost. -At this point RemoveObserver override is already freed, so RenderProcessHost -is pure virtual. This crash happens at least building with GCC: - - at /usr/include/c++/8/ext/new_allocator.h:140 - (this=0x7fffffffcb50, __in_chrg=) at /usr/include/c++/8/bits/stl_tree.h:964 - -We need to destroy RenderProcessUserData before that happens. To do that -we can just override RenderProcessHostDestroyed. - -Bug: 910288 -Change-Id: I38107b178829b0cb7494f5333b765e5b087d82cd -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1645366 -Commit-Queue: Sigurður Ásgeirsson -Reviewed-by: Sigurður Ásgeirsson -Cr-Commit-Position: refs/heads/master@{#666279} ---- - -diff --git a/chrome/browser/performance_manager/render_process_user_data.cc b/chrome/browser/performance_manager/render_process_user_data.cc -index 2e2c199..ef6e1fb 100644 ---- a/chrome/browser/performance_manager/render_process_user_data.cc -+++ b/chrome/browser/performance_manager/render_process_user_data.cc -@@ -116,4 +116,9 @@ - base::Unretained(process_node_.get()), info.exit_code)); - } - -+void RenderProcessUserData::RenderProcessHostDestroyed( -+ content::RenderProcessHost* host) { -+ host->RemoveUserData(kRenderProcessUserDataKey); -+} -+ - } // namespace performance_manager -diff --git a/chrome/browser/performance_manager/render_process_user_data.h b/chrome/browser/performance_manager/render_process_user_data.h -index ac74b1d..f3b4d16 100644 ---- a/chrome/browser/performance_manager/render_process_user_data.h -+++ b/chrome/browser/performance_manager/render_process_user_data.h -@@ -47,6 +47,7 @@ - void RenderProcessExited( - content::RenderProcessHost* host, - const content::ChildProcessTerminationInfo& info) override; -+ void RenderProcessHostDestroyed(content::RenderProcessHost* host) override; - - // All instances are linked together in a doubly linked list to allow orderly - // destruction at browser shutdown time. diff --git a/testing/chromium/patches/chromium-75-unique_ptr.patch b/testing/chromium/patches/chromium-75-unique_ptr.patch deleted file mode 100644 index 08d2f243..00000000 --- a/testing/chromium/patches/chromium-75-unique_ptr.patch +++ /dev/null @@ -1,31 +0,0 @@ -From aeed4d1f15ce84a17ea0bc219e258dc4982b2368 Mon Sep 17 00:00:00 2001 -From: Jose Dapena Paz -Date: Fri, 26 Apr 2019 20:07:05 +0000 -Subject: [PATCH] libstdc++: do not assume unique_ptr has ostream operator - -CompositorFrameReportingController is using DCHECK_NE to compare -several unique_ptr. This is valid in libc++, but on libstdc++ unique_ptr -does not have an ostream operator. - -Change-Id: I9f23ef17f02b9e107694ba493f6f8f3caf5cac4d -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1584292 -Reviewed-by: Sunny Sachanandani -Commit-Queue: José Dapena Paz -Cr-Commit-Position: refs/heads/master@{#654570} ---- - -diff --git a/cc/scheduler/compositor_frame_reporting_controller.cc b/cc/scheduler/compositor_frame_reporting_controller.cc -index f1587ed..1b17021 100644 ---- a/cc/scheduler/compositor_frame_reporting_controller.cc -+++ b/cc/scheduler/compositor_frame_reporting_controller.cc -@@ -31,8 +31,8 @@ - - void CompositorFrameReportingController::WillBeginMainFrame() { - DCHECK(reporters_[PipelineStage::kBeginImplFrame]); -- DCHECK_NE(reporters_[PipelineStage::kBeginMainFrame], -- reporters_[PipelineStage::kBeginImplFrame]); -+ DCHECK(reporters_[PipelineStage::kBeginMainFrame] != -+ reporters_[PipelineStage::kBeginImplFrame]); - reporters_[PipelineStage::kBeginImplFrame]->StartStage( - "SendBeginMainFrameToCommit"); - AdvanceReporterStage(PipelineStage::kBeginImplFrame, diff --git a/testing/chromium/patches/chromium-compiler-r9.patch b/testing/chromium/patches/chromium-compiler-r9.patch deleted file mode 100644 index 6b6c81b2..00000000 --- a/testing/chromium/patches/chromium-compiler-r9.patch +++ /dev/null @@ -1,196 +0,0 @@ -From a1207cc75454e653030716948d27ec27412f6fe8 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Sat, 1 Jun 2019 14:22:57 +0100 -Subject: [PATCH] Disable various compiler configs - ---- - build/config/compiler/BUILD.gn | 68 +++++++++++++++------------------- - 1 file changed, 29 insertions(+), 39 deletions(-) - -diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 4b24c76..0737326 100644 ---- a/build/config/compiler/BUILD.gn -+++ b/build/config/compiler/BUILD.gn -@@ -230,8 +230,6 @@ config("compiler") { - - configs += [ - # See the definitions below. -- ":clang_revision", -- ":compiler_cpu_abi", - ":compiler_codegen", - ":compiler_deterministic", - ] -@@ -471,20 +469,6 @@ config("compiler") { - } - } - -- if (is_clang && !is_nacl && !use_xcode_clang) { -- cflags += [ "-fcrash-diagnostics-dir=" + -- rebase_path("//tools/clang/crashreports", root_build_dir) ] -- -- cflags += [ -- # TODO(hans): Remove this once Clang generates better optimized debug info -- # by default. https://crbug.com/765793 -- "-Xclang", -- "-mllvm", -- "-Xclang", -- "-instcombine-lower-dbg-declare=0", -- ] -- } -- - # C11/C++11 compiler flags setup. - # --------------------------- - if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") { -@@ -1433,6 +1417,12 @@ config("default_warnings") { - "-Wno-narrowing", - ] - -+ # -Wno-class-memaccess warns about hash table and vector in blink. -+ # But the violation is intentional. -+ if (!is_nacl) { -+ cflags_cc += [ "-Wno-class-memaccess" ] -+ } -+ - # -Wunused-local-typedefs is broken in gcc, - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63872 - cflags += [ "-Wno-unused-local-typedefs" ] -@@ -1447,6 +1437,10 @@ config("default_warnings") { - # comments - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61638 - cflags += [ "-Wno-comments" ] -+ -+ # -Wpacked-not-aligned complains all generated mojom-shared-internal.h -+ # files. -+ cflags += [ "-Wno-packed-not-aligned" ] - } - } - -@@ -1523,7 +1517,7 @@ config("chromium_code") { - defines = [ "_HAS_NODISCARD" ] - } - } else { -- cflags = [ "-Wall" ] -+ cflags = [] - if (treat_warnings_as_errors) { - cflags += [ "-Werror" ] - -@@ -1532,10 +1526,6 @@ config("chromium_code") { - # well. - ldflags = [ "-Werror" ] - } -- if (is_clang) { -- # Enable extra warnings for chromium_code when we control the compiler. -- cflags += [ "-Wextra" ] -- } - - # In Chromium code, we define __STDC_foo_MACROS in order to get the - # C99 macros on Mac and Linux. -@@ -1544,15 +1534,6 @@ config("chromium_code") { - "__STDC_FORMAT_MACROS", - ] - -- if (!is_debug && !using_sanitizer && current_cpu != "s390x" && -- current_cpu != "s390" && current_cpu != "ppc64" && -- current_cpu != "mips" && current_cpu != "mips64") { -- # Non-chromium code is not guaranteed to compile cleanly with -- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are -- # disabled, so only do that for Release build. -- defines += [ "_FORTIFY_SOURCE=2" ] -- } -- - if (is_mac) { - cflags_objc = [ "-Wobjc-missing-property-synthesis" ] - cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] -@@ -1941,7 +1922,8 @@ config("default_stack_frames") { - } - - # Default "optimization on" config. --config("optimize") { -+config("optimize") { } -+config("xoptimize") { - if (is_win) { - # TODO(thakis): Remove is_clang here, https://crbug.com/598772 - if (is_official_build && full_wpo_on_official && !is_clang) { -@@ -1975,7 +1957,8 @@ config("optimize") { - } - - # Same config as 'optimize' but without the WPO flag. --config("optimize_no_wpo") { -+config("optimize_no_wpo") { } -+config("xoptimize_no_wpo") { - if (is_win) { - # Favor size over speed, /O1 must be before the common flags. The GYP - # build also specifies /Os and /GF but these are implied by /O1. -@@ -1998,7 +1981,8 @@ config("optimize_no_wpo") { - } - - # Turn off optimizations. --config("no_optimize") { -+config("no_optimize") { } -+config("xno_optimize") { - if (is_win) { - cflags = [ - "/Od", # Disable optimization. -@@ -2026,7 +2010,8 @@ config("no_optimize") { - # Turns up the optimization level. On Windows, this implies whole program - # optimization and link-time code generation which is very expensive and should - # be used sparingly. --config("optimize_max") { -+config("optimize_max") { } -+config("xoptimize_max") { - if (is_nacl && is_nacl_irt) { - # The NaCl IRT is a special case and always wants its own config. - # Various components do: -@@ -2073,7 +2058,8 @@ config("optimize_max") { - # - # TODO(crbug.com/621335) - rework how all of these configs are related - # so that we don't need this disclaimer. --config("optimize_speed") { -+config("optimize_speed") { } -+config("xoptimize_speed") { - if (is_nacl && is_nacl_irt) { - # The NaCl IRT is a special case and always wants its own config. - # Various components do: -@@ -2111,7 +2097,8 @@ config("optimize_speed") { - } - } - --config("optimize_fuzzing") { -+config("optimize_fuzzing") { } -+config("xoptimize_fuzzing") { - cflags = [ "-O1" ] + common_optimize_on_cflags - ldflags = common_optimize_on_ldflags - visibility = [ ":default_optimization" ] -@@ -2213,7 +2200,8 @@ config("win_pdbaltpath") { - } - - # Full symbols. --config("symbols") { -+config("symbols") { } -+config("xsymbols") { - if (is_win) { - if (use_goma || is_clang) { - # Note that with VC++ this requires is_win_fastlink, enforced elsewhere. -@@ -2323,7 +2311,8 @@ config("symbols") { - # Minimal symbols. - # This config guarantees to hold symbol for stack trace which are shown to user - # when crash happens in unittests running on buildbot. --config("minimal_symbols") { -+config("minimal_symbols") { } -+config("xminimal_symbols") { - if (is_win) { - # Linker symbols for backtraces only. - cflags = [] -@@ -2380,7 +2369,8 @@ config("minimal_symbols") { - } - - # No symbols. --config("no_symbols") { -+config("no_symbols") { } -+config("xno_symbols") { - if (!is_win) { - cflags = [ "-g0" ] - asmflags = cflags --- -2.21.0 - diff --git a/testing/chromium/patches/chromium-fix-char_traits.patch b/testing/chromium/patches/chromium-fix-char_traits.patch deleted file mode 100644 index 4cb9503a..00000000 --- a/testing/chromium/patches/chromium-fix-char_traits.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/base/strings/char_traits.h -+++ b/base/strings/char_traits.h -@@ -67,9 +67,9 @@ - return __builtin_memcmp(s1, s2, n); - #else - for (; n; --n, ++s1, ++s2) { -- if (*s1 < *s2) -+ if ((unsigned char)*s1 < (unsigned char)*s2) - return -1; -- if (*s1 > *s2) -+ if ((unsigned char)*s1 > (unsigned char)*s2) - return 1; - } - return 0; diff --git a/testing/chromium/patches/chromium-optional-atk-r1.patch b/testing/chromium/patches/chromium-optional-atk-r1.patch deleted file mode 100644 index e992efab..00000000 --- a/testing/chromium/patches/chromium-optional-atk-r1.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git chromium-73.0.3683.103/build/config/ui.gni chromium-73.0.3683.103/build/config/ui.gni -index 547b42fb5..966b00c2a 100644 ---- chromium-73.0.3683.103/build/config/ui.gni -+++ chromium-73.0.3683.103/build/config/ui.gni -@@ -51,8 +51,10 @@ if (use_ozone) { - use_glib = false - } - --# Whether to use atk, the Accessibility ToolKit library --use_atk = is_desktop_linux && use_x11 -+declare_args() { -+ # Whether to use atk, the Accessibility ToolKit library -+ use_atk = is_desktop_linux && use_x11 -+} - # ============================================= - # PLEASE DO NOT ADD MORE FLAGS TO THIS FILE - # ============================================= -diff --git chromium-73.0.3683.103/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc chromium-73.0.3683.103/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc -index bd2f435da..5c2ec8b90 100644 ---- chromium-73.0.3683.103/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc -+++ chromium-73.0.3683.103/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc -@@ -17,7 +17,9 @@ - #include "base/threading/thread_task_runner_handle.h" - #include "base/trace_event/trace_event.h" - #include "third_party/skia/include/core/SkPath.h" -+#if defined(USE_ATK) - #include "ui/accessibility/platform/atk_util_auralinux.h" -+#endif - #include "ui/aura/client/aura_constants.h" - #include "ui/aura/client/cursor_client.h" - #include "ui/aura/client/focus_client.h" -@@ -2049,11 +2051,15 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent( - break; - } - case KeyPress: { -+#if defined(USE_ATK) - if (ui::AtkUtilAuraLinux::HandleKeyEvent(xev) != - ui::DiscardAtkKeyEvent::Discard) { -+#endif - ui::KeyEvent keydown_event(xev); - DispatchKeyEvent(&keydown_event); -+#if defined(USE_ATK) - } -+#endif - break; - } - case KeyRelease: { -@@ -2062,11 +2068,15 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent( - if (!IsActive() && !HasCapture()) - break; - -+#if defined(USE_ATK) - if (ui::AtkUtilAuraLinux::HandleKeyEvent(xev) != - ui::DiscardAtkKeyEvent::Discard) { -+#endif - ui::KeyEvent key_event(xev); - DispatchKeyEvent(&key_event); -+#if defined(USE_ATK) - } -+#endif - break; - } - case ButtonPress: diff --git a/testing/chromium/patches/chromium-optional-dbus-r5.patch b/testing/chromium/patches/chromium-optional-dbus-r5.patch deleted file mode 100644 index 3e1faa75..00000000 --- a/testing/chromium/patches/chromium-optional-dbus-r5.patch +++ /dev/null @@ -1,185 +0,0 @@ ---- chromium-75.0.3770.100/chrome/browser/BUILD.gn -+++ chromium-75.0.3770.100/chrome/browser/BUILD.gn -@@ -3681,14 +3681,16 @@ jumbo_split_static_library("browser") { - "first_run/upgrade_util_linux.cc", - "first_run/upgrade_util_linux.h", - "icon_loader_auralinux.cc", -- "password_manager/native_backend_kwallet_x.cc", -- "password_manager/native_backend_kwallet_x.h", - "platform_util_linux.cc", - "shell_integration_linux.cc", - "shell_integration_linux.h", - ] - - if (use_dbus) { -+ sources += [ -+ "password_manager/native_backend_kwallet_x.cc", -+ "password_manager/native_backend_kwallet_x.h", -+ ] - deps += [ "//components/dbus:dbus_thread_linux" ] - } - ---- chromium-75.0.3770.100/chrome/browser/chrome_browser_main_linux.cc -+++ chromium-75.0.3770.100/chrome/browser/chrome_browser_main_linux.cc -@@ -95,7 +95,7 @@ void ChromeBrowserMainPartsLinux::PostProfileInit() { - } - - void ChromeBrowserMainPartsLinux::PostMainMessageLoopStart() { --#if !defined(OS_CHROMEOS) -+#if !defined(OS_CHROMEOS) && defined(USE_DBUS) - bluez::BluezDBusManager::Initialize(nullptr /* system_bus */); - #endif - -@@ -103,7 +103,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopStart() { - } - - void ChromeBrowserMainPartsLinux::PostDestroyThreads() { --#if !defined(OS_CHROMEOS) -+#if !defined(OS_CHROMEOS) && defined(USE_DBUS) - bluez::BluezDBusManager::Shutdown(); - bluez::BluezDBusThreadManager::Shutdown(); - #endif -diff --git chromium-75.0.3770.100/chrome/browser/metrics/bluetooth_available_utility.cc chromium-75.0.3770.100/chrome/browser/metrics/bluetooth_available_utility.cc -index 1f6c223..dcade65 100644 ---- chromium-75.0.3770.100/chrome/browser/metrics/bluetooth_available_utility.cc -+++ chromium-75.0.3770.100/chrome/browser/metrics/bluetooth_available_utility.cc -@@ -14,7 +14,7 @@ - #include "device/bluetooth/bluetooth_adapter.h" - #include "device/bluetooth/bluetooth_adapter_factory.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) && defined(USE_DBUS) - #include "device/bluetooth/dbus/bluez_dbus_manager.h" - #endif // defined(OS_LINUX) - -@@ -62,7 +62,7 @@ void ReportBluetoothAvailability() { - return; - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) && defined(USE_DBUS) - // This is for tests that have not initialized bluez or dbus thread manager. - // Outside of tests these are initialized earlier during browser startup. - if (!bluez::BluezDBusManager::IsInitialized()) -diff --git chromium-75.0.3770.100/chrome/browser/password_manager/password_store_factory.cc chromium-75.0.3770.100/chrome/browser/password_manager/password_store_factory.cc -index 03d205d0e..cb8e9e820 100644 ---- chromium-75.0.3770.100/chrome/browser/password_manager/password_store_factory.cc -+++ chromium-75.0.3770.100/chrome/browser/password_manager/password_store_factory.cc -@@ -211,6 +211,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( - std::unique_ptr backend; - if (selected_backend == os_crypt::SelectedLinuxBackend::KWALLET || - selected_backend == os_crypt::SelectedLinuxBackend::KWALLET5) { -+#if defined(USE_DBUS) - VLOG(1) << "Trying KWallet for password storage."; - base::nix::DesktopEnvironment used_desktop_env = - selected_backend == os_crypt::SelectedLinuxBackend::KWALLET -@@ -223,6 +224,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( - } else { - backend.reset(); - } -+#endif // defined(USE_DBUS) - } else if (selected_backend == os_crypt::SelectedLinuxBackend::GNOME_ANY || - selected_backend == - os_crypt::SelectedLinuxBackend::GNOME_KEYRING || -diff --git chromium-75.0.3770.100/device/bluetooth/bluetooth_adapter_factory.cc chromium-75.0.3770.100/device/bluetooth/bluetooth_adapter_factory.cc -index 6413a162c..4a7fa801a 100644 ---- chromium-75.0.3770.100/device/bluetooth/bluetooth_adapter_factory.cc -+++ chromium-75.0.3770.100/device/bluetooth/bluetooth_adapter_factory.cc -@@ -96,7 +96,7 @@ bool BluetoothAdapterFactory::IsBluetoothSupported() { - // instance even on platforms that would otherwise not support it. - if (default_adapter.Get()) - return true; --#if defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_LINUX) || \ -+#if defined(OS_ANDROID) || defined(OS_WIN) || (defined(OS_LINUX) && defined(USE_DBUS)) || \ - defined(OS_MACOSX) - return true; - #else -@@ -119,7 +119,7 @@ bool BluetoothAdapterFactory::IsLowEnergySupported() { - return base::win::GetVersion() >= base::win::VERSION_WIN10; - #elif defined(OS_MACOSX) - return base::mac::IsAtLeastOS10_10(); --#elif defined(OS_LINUX) -+#elif (defined(OS_LINUX) && defined(USE_DBUS)) - return true; - #else - return false; -diff --git chromium-75.0.3770.100/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.cc chromium-75.0.3770.100/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.cc -index adbe0ca74..91781e839 100644 ---- chromium-75.0.3770.100/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.cc -+++ chromium-75.0.3770.100/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.cc -@@ -1328,7 +1328,7 @@ void BluetoothLowEnergyCreateServiceFunction::DoWork() { - // TODO: Ideally this should be handled by our feature system, so that this - // code doesn't even compile on OSes it isn't being used on, but currently this - // is not possible. --#if !defined(OS_WIN) -+#if !defined(OS_WIN) && (!defined(OS_LINUX) || defined(USE_DBUS)) - base::WeakPtr service = - device::BluetoothLocalGattService::Create( - event_router_->adapter(), -@@ -1357,6 +1357,7 @@ bool BluetoothLowEnergyCreateCharacteristicFunction::ParseParams() { - } - - void BluetoothLowEnergyCreateCharacteristicFunction::DoWork() { -+#if !defined(OS_LINUX) || defined(USE_DBUS) - device::BluetoothLocalGattService* service = - event_router_->adapter()->GetGattService(params_->service_id); - if (!service) { -@@ -1377,6 +1378,9 @@ void BluetoothLowEnergyCreateCharacteristicFunction::DoWork() { - - Respond(ArgumentList(apibtle::CreateCharacteristic::Results::Create( - characteristic->GetIdentifier()))); -+#else -+ Respond(Error(kErrorPlatformNotSupported)); -+#endif - } - - // createDescriptor: -@@ -1393,6 +1397,7 @@ bool BluetoothLowEnergyCreateDescriptorFunction::ParseParams() { - } - - void BluetoothLowEnergyCreateDescriptorFunction::DoWork() { -+#if !defined(OS_LINUX) || defined(USE_DBUS) - device::BluetoothLocalGattCharacteristic* characteristic = - event_router_->GetLocalCharacteristic(params_->characteristic_id); - if (!characteristic) { -@@ -1408,6 +1413,9 @@ void BluetoothLowEnergyCreateDescriptorFunction::DoWork() { - - Respond(ArgumentList( - apibtle::CreateDescriptor::Results::Create(descriptor->GetIdentifier()))); -+#else -+ Respond(Error(kErrorPlatformNotSupported)); -+#endif - } - - // registerService: -diff --git chromium-75.0.3770.100/services/device/battery/battery_status_manager_default.cc chromium-75.0.3770.100/services/device/battery/battery_status_manager_default.cc -index 0249c6faa..ab2ff4e17 100644 ---- chromium-75.0.3770.100/services/device/battery/battery_status_manager_default.cc -+++ chromium-75.0.3770.100/services/device/battery/battery_status_manager_default.cc -@@ -22,11 +22,10 @@ class BatteryStatusManagerDefault : public BatteryStatusManager { - private: - // BatteryStatusManager: - bool StartListeningBatteryChange() override { -- NOTIMPLEMENTED(); - return false; - } - -- void StopListeningBatteryChange() override { NOTIMPLEMENTED(); } -+ void StopListeningBatteryChange() override { } - - DISALLOW_COPY_AND_ASSIGN(BatteryStatusManagerDefault); - }; -diff --git chromium-75.0.3770.100/services/device/wake_lock/power_save_blocker/BUILD.gn chromium-75.0.3770.100/services/device/wake_lock/power_save_blocker/BUILD.gn -index 788bb497b..b40c0394f 100644 ---- chromium-75.0.3770.100/services/device/wake_lock/power_save_blocker/BUILD.gn -+++ chromium-75.0.3770.100/services/device/wake_lock/power_save_blocker/BUILD.gn -@@ -62,6 +62,9 @@ source_set("power_save_blocker") { - if (is_chromeos || !use_x11 || !use_dbus) { - sources -= [ "power_save_blocker_x11.cc" ] - } -+ if (!is_chromeos && use_x11 && !use_dbus) { -+ sources += [ "power_save_blocker_ozone.cc" ] -+ } - - if (is_android) { - deps += [ ":jni_headers" ] diff --git a/testing/chromium/patches/chromium-url-formatter.patch b/testing/chromium/patches/chromium-url-formatter.patch deleted file mode 100644 index 65600681..00000000 --- a/testing/chromium/patches/chromium-url-formatter.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git chromium-73.0.3683.103/components/url_formatter/url_formatter.cc chromium-73.0.3683.103/components/url_formatter/url_formatter.cc -index 97bc67e4b..caead697b 100644 ---- chromium-73.0.3683.103/components/url_formatter/url_formatter.cc -+++ chromium-73.0.3683.103/components/url_formatter/url_formatter.cc -@@ -410,14 +410,14 @@ IDNConversionStatus IDNToUnicodeOneComponent(const base::char16* comp, - } // namespace - - const FormatUrlType kFormatUrlOmitNothing = 0; --const FormatUrlType kFormatUrlOmitUsernamePassword = 1 << 0; --const FormatUrlType kFormatUrlOmitHTTP = 1 << 1; --const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 1 << 2; --const FormatUrlType kFormatUrlOmitHTTPS = 1 << 3; --const FormatUrlType kFormatUrlOmitTrivialSubdomains = 1 << 5; --const FormatUrlType kFormatUrlTrimAfterHost = 1 << 6; --const FormatUrlType kFormatUrlOmitFileScheme = 1 << 7; --const FormatUrlType kFormatUrlOmitMailToScheme = 1 << 8; -+const FormatUrlType kFormatUrlOmitUsernamePassword = 0; -+const FormatUrlType kFormatUrlOmitHTTP = 0; -+const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 0; -+const FormatUrlType kFormatUrlOmitHTTPS = 0; -+const FormatUrlType kFormatUrlOmitTrivialSubdomains = 0; -+const FormatUrlType kFormatUrlTrimAfterHost = 0; -+const FormatUrlType kFormatUrlOmitFileScheme = 0; -+const FormatUrlType kFormatUrlOmitMailToScheme = 0; - - const FormatUrlType kFormatUrlOmitDefaults = - kFormatUrlOmitUsernamePassword | kFormatUrlOmitHTTP | diff --git a/testing/chromium/patches/chromium-widevine-r4.patch b/testing/chromium/patches/chromium-widevine-r4.patch deleted file mode 100644 index d5a3be83..00000000 --- a/testing/chromium/patches/chromium-widevine-r4.patch +++ /dev/null @@ -1,26 +0,0 @@ -Define WIDEVINE_CDM_VERSION_STRING && re-re-re-patch for latest ninja - -Stolen from Arch basically. - -gmt - ---- a/chrome/common/chrome_content_client.cc -+++ b/chrome/common/chrome_content_client.cc -@@ -99,7 +99,7 @@ - // Registers Widevine CDM if Widevine is enabled, the Widevine CDM is - // bundled and not a component. When the Widevine CDM is a component, it is - // registered in widevine_cdm_component_installer.cc. --#if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) -+#if BUILDFLAG(ENABLE_WIDEVINE) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) - #define REGISTER_BUNDLED_WIDEVINE_CDM - #include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck - // TODO(crbug.com/663554): Needed for WIDEVINE_CDM_VERSION_STRING. Support ---- a/third_party/widevine/cdm/widevine_cdm_version.h -+++ b/third_party/widevine/cdm/widevine_cdm_version.h -@@ -11,5 +11,6 @@ - // If the Widevine CDM is available define the following: - // - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available - // as a string, e.g., "1.0.123.456"). -+#define WIDEVINE_CDM_VERSION_STRING "unknown" - - #endif // WIDEVINE_CDM_VERSION_H_ diff --git a/testing/chromium/patches/device-notifications.patch b/testing/chromium/patches/device-notifications.patch deleted file mode 100644 index d428e7e5..00000000 --- a/testing/chromium/patches/device-notifications.patch +++ /dev/null @@ -1,16 +0,0 @@ -description: disable device discovery notifications by default -author: Michael Gilbert -bug-debian: http://bugs.debian.org/856571 - ---- a/chrome/browser/printing/cloud_print/privet_notifications.cc -+++ b/chrome/browser/printing/cloud_print/privet_notifications.cc -@@ -229,8 +229,7 @@ void PrivetNotificationService::DeviceCa - // static - bool PrivetNotificationService::IsEnabled() { - base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); -- return !command_line->HasSwitch( -- switches::kDisableDeviceDiscoveryNotifications); -+ return command_line->HasSwitch(switches::kEnableDeviceDiscoveryNotifications); - } - - // static diff --git a/testing/chromium/patches/disable-crash-reporter.patch b/testing/chromium/patches/disable-crash-reporter.patch deleted file mode 100644 index 4fb257bb..00000000 --- a/testing/chromium/patches/disable-crash-reporter.patch +++ /dev/null @@ -1,56 +0,0 @@ -# Disable some background communication with clients2.google.com - ---- a/third_party/breakpad/breakpad/src/client/linux/sender/google_crash_report_sender.cc -+++ b/third_party/breakpad/breakpad/src/client/linux/sender/google_crash_report_sender.cc -@@ -85,6 +85,7 @@ bool CheckForRequiredFlagsOrDie() { - } - - int main(int argc, char *argv[]) { -+ return 0; - google::InitGoogleLogging(argv[0]); - google::ParseCommandLineFlags(&argc, &argv, true); - if (!CheckForRequiredFlagsOrDie()) { ---- a/chrome/browser/tracing/crash_service_uploader.cc -+++ b/chrome/browser/tracing/crash_service_uploader.cc -@@ -132,11 +132,16 @@ void TraceCrashServiceUploader::DoUpload - progress_callback_ = progress_callback; - done_callback_ = std::move(done_callback); - -- base::PostTaskWithTraits( -- FROM_HERE, {base::TaskPriority::BEST_EFFORT}, -- base::BindOnce(&TraceCrashServiceUploader::DoCompressOnBackgroundThread, -- base::Unretained(this), file_contents, upload_mode, -- upload_url_, std::move(metadata))); -+ if (!progress_callback_.is_null()) { -+ base::PostTaskWithTraits( -+ FROM_HERE, {content::BrowserThread::UI}, -+ base::Bind(progress_callback_, 1, 1)); -+ } -+ if (!done_callback_.is_null()) { -+ base::PostTaskWithTraits( -+ FROM_HERE, {content::BrowserThread::UI}, -+ base::BindOnce(std::move(done_callback_), true, "Upload skipped.")); -+ } - } - - void TraceCrashServiceUploader::DoCompressOnBackgroundThread( -@@ -207,11 +212,6 @@ void TraceCrashServiceUploader::DoCompre - std::string post_data; - SetupMultipart(product, version, std::move(metadata), "trace.json.gz", - compressed_contents, &post_data); -- -- base::PostTaskWithTraits( -- FROM_HERE, {content::BrowserThread::UI}, -- base::BindOnce(&TraceCrashServiceUploader::CreateAndStartURLLoader, -- base::Unretained(this), upload_url, post_data)); - } - - void TraceCrashServiceUploader::OnUploadError( -@@ -309,6 +309,7 @@ bool TraceCrashServiceUploader::Compress - void TraceCrashServiceUploader::CreateAndStartURLLoader( - const std::string& upload_url, - const std::string& post_data) { -+ return; - DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - DCHECK(!simple_url_loader_); - diff --git a/testing/chromium/patches/disable-domain-reliability.patch b/testing/chromium/patches/disable-domain-reliability.patch deleted file mode 100644 index dc800b90..00000000 --- a/testing/chromium/patches/disable-domain-reliability.patch +++ /dev/null @@ -1,660 +0,0 @@ -# Disable domain reliability component - ---- a/components/domain_reliability/google_configs.cc -+++ b/components/domain_reliability/google_configs.cc -@@ -13,575 +13,10 @@ - - namespace domain_reliability { - --namespace { -- --struct GoogleConfigParams { -- const char* hostname; -- bool include_subdomains; -- -- // If true, prepend a collector URL within https://|hostname|/. -- bool include_origin_specific_collector; -- -- // If true, also add a config for www.|hostname|. -- // -- // |include_subdomains| will be false in the extra config, but -- // |include_origin_specific_collector| will be respected, and will use the -- // www subdomain as the origin for the collector so it matches the config. -- bool duplicate_for_www; --}; -- --const GoogleConfigParams kGoogleConfigs[] = { -- // Origins with subdomains and same-origin collectors. Currently, all -- // origins with same-origin collectors also run collectors on their www -- // subdomain. (e.g., both foo.com and www.foo.com.) -- {"google.ac", true, true, true}, -- {"google.ad", true, true, true}, -- {"google.ae", true, true, true}, -- {"google.af", true, true, true}, -- {"google.ag", true, true, true}, -- {"google.al", true, true, true}, -- {"google.am", true, true, true}, -- {"google.as", true, true, true}, -- {"google.at", true, true, true}, -- {"google.az", true, true, true}, -- {"google.ba", true, true, true}, -- {"google.be", true, true, true}, -- {"google.bf", true, true, true}, -- {"google.bg", true, true, true}, -- {"google.bi", true, true, true}, -- {"google.bj", true, true, true}, -- {"google.bs", true, true, true}, -- {"google.bt", true, true, true}, -- {"google.by", true, true, true}, -- {"google.ca", true, true, true}, -- {"google.cc", true, true, true}, -- {"google.cd", true, true, true}, -- {"google.cf", true, true, true}, -- {"google.cg", true, true, true}, -- {"google.ch", true, true, true}, -- {"google.ci", true, true, true}, -- {"google.cl", true, true, true}, -- {"google.cm", true, true, true}, -- {"google.cn", true, true, true}, -- {"google.co.ao", true, true, true}, -- {"google.co.bw", true, true, true}, -- {"google.co.ck", true, true, true}, -- {"google.co.cr", true, true, true}, -- {"google.co.hu", true, true, true}, -- {"google.co.id", true, true, true}, -- {"google.co.il", true, true, true}, -- {"google.co.im", true, true, true}, -- {"google.co.in", true, true, true}, -- {"google.co.je", true, true, true}, -- {"google.co.jp", true, true, true}, -- {"google.co.ke", true, true, true}, -- {"google.co.kr", true, true, true}, -- {"google.co.ls", true, true, true}, -- {"google.co.ma", true, true, true}, -- {"google.co.mz", true, true, true}, -- {"google.co.nz", true, true, true}, -- {"google.co.th", true, true, true}, -- {"google.co.tz", true, true, true}, -- {"google.co.ug", true, true, true}, -- {"google.co.uk", true, true, true}, -- {"google.co.uz", true, true, true}, -- {"google.co.ve", true, true, true}, -- {"google.co.vi", true, true, true}, -- {"google.co.za", true, true, true}, -- {"google.co.zm", true, true, true}, -- {"google.co.zw", true, true, true}, -- {"google.com.af", true, true, true}, -- {"google.com.ag", true, true, true}, -- {"google.com.ai", true, true, true}, -- {"google.com.ar", true, true, true}, -- {"google.com.au", true, true, true}, -- {"google.com.bd", true, true, true}, -- {"google.com.bh", true, true, true}, -- {"google.com.bn", true, true, true}, -- {"google.com.bo", true, true, true}, -- {"google.com.br", true, true, true}, -- {"google.com.by", true, true, true}, -- {"google.com.bz", true, true, true}, -- {"google.com.cn", true, true, true}, -- {"google.com.co", true, true, true}, -- {"google.com.cu", true, true, true}, -- {"google.com.cy", true, true, true}, -- {"google.com.do", true, true, true}, -- {"google.com.ec", true, true, true}, -- {"google.com.eg", true, true, true}, -- {"google.com.et", true, true, true}, -- {"google.com.fj", true, true, true}, -- {"google.com.ge", true, true, true}, -- {"google.com.gh", true, true, true}, -- {"google.com.gi", true, true, true}, -- {"google.com.gr", true, true, true}, -- {"google.com.gt", true, true, true}, -- {"google.com.hk", true, true, true}, -- {"google.com.iq", true, true, true}, -- {"google.com.jm", true, true, true}, -- {"google.com.jo", true, true, true}, -- {"google.com.kh", true, true, true}, -- {"google.com.kw", true, true, true}, -- {"google.com.lb", true, true, true}, -- {"google.com.ly", true, true, true}, -- {"google.com.mm", true, true, true}, -- {"google.com.mt", true, true, true}, -- {"google.com.mx", true, true, true}, -- {"google.com.my", true, true, true}, -- {"google.com.na", true, true, true}, -- {"google.com.nf", true, true, true}, -- {"google.com.ng", true, true, true}, -- {"google.com.ni", true, true, true}, -- {"google.com.np", true, true, true}, -- {"google.com.nr", true, true, true}, -- {"google.com.om", true, true, true}, -- {"google.com.pa", true, true, true}, -- {"google.com.pe", true, true, true}, -- {"google.com.pg", true, true, true}, -- {"google.com.ph", true, true, true}, -- {"google.com.pk", true, true, true}, -- {"google.com.pl", true, true, true}, -- {"google.com.pr", true, true, true}, -- {"google.com.py", true, true, true}, -- {"google.com.qa", true, true, true}, -- {"google.com.ru", true, true, true}, -- {"google.com.sa", true, true, true}, -- {"google.com.sb", true, true, true}, -- {"google.com.sg", true, true, true}, -- {"google.com.sl", true, true, true}, -- {"google.com.sv", true, true, true}, -- {"google.com.tj", true, true, true}, -- {"google.com.tn", true, true, true}, -- {"google.com.tr", true, true, true}, -- {"google.com.tw", true, true, true}, -- {"google.com.ua", true, true, true}, -- {"google.com.uy", true, true, true}, -- {"google.com.vc", true, true, true}, -- {"google.com.ve", true, true, true}, -- {"google.com.vn", true, true, true}, -- {"google.cv", true, true, true}, -- {"google.cz", true, true, true}, -- {"google.de", true, true, true}, -- {"google.dj", true, true, true}, -- {"google.dk", true, true, true}, -- {"google.dm", true, true, true}, -- {"google.dz", true, true, true}, -- {"google.ee", true, true, true}, -- {"google.es", true, true, true}, -- {"google.fi", true, true, true}, -- {"google.fm", true, true, true}, -- {"google.fr", true, true, true}, -- {"google.ga", true, true, true}, -- {"google.ge", true, true, true}, -- {"google.gg", true, true, true}, -- {"google.gl", true, true, true}, -- {"google.gm", true, true, true}, -- {"google.gp", true, true, true}, -- {"google.gr", true, true, true}, -- {"google.gy", true, true, true}, -- {"google.hk", true, true, true}, -- {"google.hn", true, true, true}, -- {"google.hr", true, true, true}, -- {"google.ht", true, true, true}, -- {"google.hu", true, true, true}, -- {"google.ie", true, true, true}, -- {"google.im", true, true, true}, -- {"google.iq", true, true, true}, -- {"google.ir", true, true, true}, -- {"google.is", true, true, true}, -- {"google.it", true, true, true}, -- {"google.it.ao", true, true, true}, -- {"google.je", true, true, true}, -- {"google.jo", true, true, true}, -- {"google.jp", true, true, true}, -- {"google.kg", true, true, true}, -- {"google.ki", true, true, true}, -- {"google.kz", true, true, true}, -- {"google.la", true, true, true}, -- {"google.li", true, true, true}, -- {"google.lk", true, true, true}, -- {"google.lt", true, true, true}, -- {"google.lu", true, true, true}, -- {"google.lv", true, true, true}, -- {"google.md", true, true, true}, -- {"google.me", true, true, true}, -- {"google.mg", true, true, true}, -- {"google.mk", true, true, true}, -- {"google.ml", true, true, true}, -- {"google.mn", true, true, true}, -- {"google.ms", true, true, true}, -- {"google.mu", true, true, true}, -- {"google.mv", true, true, true}, -- {"google.mw", true, true, true}, -- {"google.ne", true, true, true}, -- {"google.ne.jp", true, true, true}, -- {"google.ng", true, true, true}, -- {"google.nl", true, true, true}, -- {"google.no", true, true, true}, -- {"google.nr", true, true, true}, -- {"google.nu", true, true, true}, -- {"google.off.ai", true, true, true}, -- {"google.pk", true, true, true}, -- {"google.pl", true, true, true}, -- {"google.pn", true, true, true}, -- {"google.ps", true, true, true}, -- {"google.pt", true, true, true}, -- {"google.ro", true, true, true}, -- {"google.rs", true, true, true}, -- {"google.ru", true, true, true}, -- {"google.rw", true, true, true}, -- {"google.sc", true, true, true}, -- {"google.se", true, true, true}, -- {"google.sh", true, true, true}, -- {"google.si", true, true, true}, -- {"google.sk", true, true, true}, -- {"google.sm", true, true, true}, -- {"google.sn", true, true, true}, -- {"google.so", true, true, true}, -- {"google.sr", true, true, true}, -- {"google.st", true, true, true}, -- {"google.td", true, true, true}, -- {"google.tg", true, true, true}, -- {"google.tk", true, true, true}, -- {"google.tl", true, true, true}, -- {"google.tm", true, true, true}, -- {"google.tn", true, true, true}, -- {"google.to", true, true, true}, -- {"google.tt", true, true, true}, -- {"google.us", true, true, true}, -- {"google.uz", true, true, true}, -- {"google.vg", true, true, true}, -- {"google.vu", true, true, true}, -- {"google.ws", true, true, true}, -- {"l.google.com", true, true, true}, -- -- // google.com is a special case. We have a custom config for www.google.com, -- // so set generate_config_for_www_subdomain = false. -- {"google.com", true, true, false}, -- -- // Origins with subdomains and without same-origin collectors. -- {"2mdn.net", true, false, false}, -- {"adgoogle.net", true, false, false}, -- {"admeld.com", true, false, false}, -- {"admob.biz", true, false, false}, -- {"admob.co.in", true, false, false}, -- {"admob.co.kr", true, false, false}, -- {"admob.co.nz", true, false, false}, -- {"admob.co.uk", true, false, false}, -- {"admob.co.za", true, false, false}, -- {"admob.com", true, false, false}, -- {"admob.com.br", true, false, false}, -- {"admob.com.es", true, false, false}, -- {"admob.com.fr", true, false, false}, -- {"admob.com.mx", true, false, false}, -- {"admob.com.pt", true, false, false}, -- {"admob.de", true, false, false}, -- {"admob.dk", true, false, false}, -- {"admob.es", true, false, false}, -- {"admob.fi", true, false, false}, -- {"admob.fr", true, false, false}, -- {"admob.gr", true, false, false}, -- {"admob.hk", true, false, false}, -- {"admob.ie", true, false, false}, -- {"admob.in", true, false, false}, -- {"admob.it", true, false, false}, -- {"admob.jp", true, false, false}, -- {"admob.kr", true, false, false}, -- {"admob.mobi", true, false, false}, -- {"admob.no", true, false, false}, -- {"admob.ph", true, false, false}, -- {"admob.pt", true, false, false}, -- {"admob.sg", true, false, false}, -- {"admob.tw", true, false, false}, -- {"admob.us", true, false, false}, -- {"admob.vn", true, false, false}, -- {"adwhirl.com", true, false, false}, -- {"ampproject.com", true, false, false}, -- {"ampproject.net", true, false, false}, -- {"ampproject.org", true, false, false}, -- {"android.com", true, false, false}, -- {"anycast-edge.metric.gstatic.com", true, false, false}, -- {"anycast-stb.metric.gstatic.com", true, false, false}, -- {"anycast.metric.gstatic.com", true, false, false}, -- {"cdn.ampproject.org", true, false, false}, -- {"chromecast.com", true, false, false}, -- {"chromeexperiments.com", true, false, false}, -- {"chromestatus.com", true, false, false}, -- {"chromium.org", true, false, false}, -- {"clients6.google.com", true, false, false}, -- {"cloudendpointsapis.com", true, false, false}, -- {"dartmotif.com", true, false, false}, -- {"dartsearch.net", true, false, false}, -- {"doubleclick.com", true, false, false}, -- {"doubleclick.ne.jp", true, false, false}, -- {"doubleclick.net", true, false, false}, -- {"doubleclickusercontent.com", true, false, false}, -- {"fls.doubleclick.net", true, false, false}, -- {"g.co", true, false, false}, -- {"g.doubleclick.net", true, false, false}, -- {"ggpht.com", true, false, false}, -- {"gmodules.com", true, false, false}, -- {"goo.gl", true, false, false}, -- {"google-syndication.com", true, false, false}, -- {"google.cat", true, false, false}, -- {"google.info", true, false, false}, -- {"google.jobs", true, false, false}, -- {"google.net", true, false, false}, -- {"google.org", true, false, false}, -- {"google.stackdriver.com", true, false, false}, -- {"googleadapis.com", true, false, false}, -- {"googleadservices.com", true, false, false}, -- {"googleadsserving.cn", true, false, false}, -- {"googlealumni.com", true, false, false}, -- {"googleapis.cn", true, false, false}, -- {"googleapis.com", true, false, false}, -- {"googleapps.com", true, false, false}, -- {"googlecbs.com", true, false, false}, -- {"googlecode.com", true, false, false}, -- {"googlecommerce.com", true, false, false}, -- {"googledrive.com", true, false, false}, -- {"googleenterprise.com", true, false, false}, -- {"googlefiber.com", true, false, false}, -- {"googlefiber.net", true, false, false}, -- {"googlegoro.com", true, false, false}, -- {"googlehosted.com", true, false, false}, -- {"googlepayments.com", true, false, false}, -- {"googlesource.com", true, false, false}, -- {"googlesyndication.com", true, false, false}, -- {"googletagmanager.com", true, false, false}, -- {"googletagservices.com", true, false, false}, -- {"googleusercontent.com", true, false, false}, -- {"googlezip.net", true, false, false}, -- {"gstatic.cn", true, false, false}, -- {"gstatic.com", true, false, false}, -- {"gvt3.com", true, false, false}, -- {"gvt9.com", true, false, false}, -- {"picasa.com", true, false, false}, -- {"recaptcha.net", true, false, false}, -- {"stackdriver.com", true, false, false}, -- {"stbcast-stb.metric.gstatic.com", true, false, false}, -- {"stbcast.metric.gstatic.com", true, false, false}, -- {"stbcast2-stb.metric.gstatic.com", true, false, false}, -- {"stbcast2.metric.gstatic.com", true, false, false}, -- {"stbcast3-stb.metric.gstatic.com", true, false, false}, -- {"stbcast3.metric.gstatic.com", true, false, false}, -- {"stbcast4-stb.metric.gstatic.com", true, false, false}, -- {"stbcast4.metric.gstatic.com", true, false, false}, -- {"unicast-edge.metric.gstatic.com", true, false, false}, -- {"unicast-stb.metric.gstatic.com", true, false, false}, -- {"unicast.metric.gstatic.com", true, false, false}, -- {"unicast2-stb.metric.gstatic.com", true, false, false}, -- {"unicast2.metric.gstatic.com", true, false, false}, -- {"waze.com", true, false, false}, -- {"withgoogle.com", true, false, false}, -- {"youtu.be", true, false, false}, -- {"youtube-3rd-party.com", true, false, false}, -- {"youtube-nocookie.com", true, false, false}, -- {"youtube.ae", true, false, false}, -- {"youtube.al", true, false, false}, -- {"youtube.am", true, false, false}, -- {"youtube.at", true, false, false}, -- {"youtube.az", true, false, false}, -- {"youtube.ba", true, false, false}, -- {"youtube.be", true, false, false}, -- {"youtube.bg", true, false, false}, -- {"youtube.bh", true, false, false}, -- {"youtube.bo", true, false, false}, -- {"youtube.ca", true, false, false}, -- {"youtube.cat", true, false, false}, -- {"youtube.ch", true, false, false}, -- {"youtube.cl", true, false, false}, -- {"youtube.co", true, false, false}, -- {"youtube.co.ae", true, false, false}, -- {"youtube.co.at", true, false, false}, -- {"youtube.co.hu", true, false, false}, -- {"youtube.co.id", true, false, false}, -- {"youtube.co.il", true, false, false}, -- {"youtube.co.in", true, false, false}, -- {"youtube.co.jp", true, false, false}, -- {"youtube.co.ke", true, false, false}, -- {"youtube.co.kr", true, false, false}, -- {"youtube.co.ma", true, false, false}, -- {"youtube.co.nz", true, false, false}, -- {"youtube.co.th", true, false, false}, -- {"youtube.co.ug", true, false, false}, -- {"youtube.co.uk", true, false, false}, -- {"youtube.co.ve", true, false, false}, -- {"youtube.co.za", true, false, false}, -- {"youtube.com", true, false, false}, -- {"youtube.com.ar", true, false, false}, -- {"youtube.com.au", true, false, false}, -- {"youtube.com.az", true, false, false}, -- {"youtube.com.bh", true, false, false}, -- {"youtube.com.bo", true, false, false}, -- {"youtube.com.br", true, false, false}, -- {"youtube.com.by", true, false, false}, -- {"youtube.com.co", true, false, false}, -- {"youtube.com.do", true, false, false}, -- {"youtube.com.ee", true, false, false}, -- {"youtube.com.eg", true, false, false}, -- {"youtube.com.es", true, false, false}, -- {"youtube.com.gh", true, false, false}, -- {"youtube.com.gr", true, false, false}, -- {"youtube.com.gt", true, false, false}, -- {"youtube.com.hk", true, false, false}, -- {"youtube.com.hr", true, false, false}, -- {"youtube.com.jm", true, false, false}, -- {"youtube.com.jo", true, false, false}, -- {"youtube.com.kw", true, false, false}, -- {"youtube.com.lb", true, false, false}, -- {"youtube.com.lv", true, false, false}, -- {"youtube.com.mk", true, false, false}, -- {"youtube.com.mt", true, false, false}, -- {"youtube.com.mx", true, false, false}, -- {"youtube.com.my", true, false, false}, -- {"youtube.com.ng", true, false, false}, -- {"youtube.com.om", true, false, false}, -- {"youtube.com.pe", true, false, false}, -- {"youtube.com.ph", true, false, false}, -- {"youtube.com.pk", true, false, false}, -- {"youtube.com.pt", true, false, false}, -- {"youtube.com.qa", true, false, false}, -- {"youtube.com.ro", true, false, false}, -- {"youtube.com.sa", true, false, false}, -- {"youtube.com.sg", true, false, false}, -- {"youtube.com.tn", true, false, false}, -- {"youtube.com.tr", true, false, false}, -- {"youtube.com.tw", true, false, false}, -- {"youtube.com.ua", true, false, false}, -- {"youtube.com.uy", true, false, false}, -- {"youtube.com.ve", true, false, false}, -- {"youtube.cz", true, false, false}, -- {"youtube.de", true, false, false}, -- {"youtube.dk", true, false, false}, -- {"youtube.ee", true, false, false}, -- {"youtube.es", true, false, false}, -- {"youtube.fi", true, false, false}, -- {"youtube.fr", true, false, false}, -- {"youtube.ge", true, false, false}, -- {"youtube.gr", true, false, false}, -- {"youtube.gt", true, false, false}, -- {"youtube.hk", true, false, false}, -- {"youtube.hr", true, false, false}, -- {"youtube.hu", true, false, false}, -- {"youtube.ie", true, false, false}, -- {"youtube.in", true, false, false}, -- {"youtube.is", true, false, false}, -- {"youtube.it", true, false, false}, -- {"youtube.jo", true, false, false}, -- {"youtube.jp", true, false, false}, -- {"youtube.kr", true, false, false}, -- {"youtube.lk", true, false, false}, -- {"youtube.lt", true, false, false}, -- {"youtube.lv", true, false, false}, -- {"youtube.ma", true, false, false}, -- {"youtube.md", true, false, false}, -- {"youtube.me", true, false, false}, -- {"youtube.mk", true, false, false}, -- {"youtube.mx", true, false, false}, -- {"youtube.my", true, false, false}, -- {"youtube.ng", true, false, false}, -- {"youtube.nl", true, false, false}, -- {"youtube.no", true, false, false}, -- {"youtube.pe", true, false, false}, -- {"youtube.ph", true, false, false}, -- {"youtube.pk", true, false, false}, -- {"youtube.pl", true, false, false}, -- {"youtube.pr", true, false, false}, -- {"youtube.pt", true, false, false}, -- {"youtube.qa", true, false, false}, -- {"youtube.ro", true, false, false}, -- {"youtube.rs", true, false, false}, -- {"youtube.ru", true, false, false}, -- {"youtube.sa", true, false, false}, -- {"youtube.se", true, false, false}, -- {"youtube.sg", true, false, false}, -- {"youtube.si", true, false, false}, -- {"youtube.sk", true, false, false}, -- {"youtube.sn", true, false, false}, -- {"youtube.tn", true, false, false}, -- {"youtube.ua", true, false, false}, -- {"youtube.ug", true, false, false}, -- {"youtube.uy", true, false, false}, -- {"youtube.vn", true, false, false}, -- {"youtubeeducation.com", true, false, false}, -- {"youtubemobilesupport.com", true, false, false}, -- {"ytimg.com", true, false, false}, -- -- // Origins without subdomains and with same-origin collectors. -- {"accounts.google.com", false, true, false}, -- {"apis.google.com", false, true, false}, -- {"app.google.stackdriver.com", false, true, false}, -- {"b.mail.google.com", false, true, false}, -- {"chatenabled.mail.google.com", false, true, false}, -- {"ddm.google.com", false, true, false}, -- {"gmail.com", false, true, false}, -- {"gmail.google.com", false, true, false}, -- {"mail-attachment.googleusercontent.com", false, true, false}, -- {"mail.google.com", false, true, false}, -- {"www.gmail.com", false, true, false}, -- -- // Origins without subdomains or same-origin collectors. -- {"ad.doubleclick.net", false, false, false}, -- {"drive.google.com", false, false, false}, -- {"redirector.googlevideo.com", false, false, false}, --}; -- --const char* const kGoogleStandardCollectors[] = { -- "https://beacons.gcp.gvt2.com/domainreliability/upload", -- "https://beacons.gvt2.com/domainreliability/upload", -- "https://beacons2.gvt2.com/domainreliability/upload", -- "https://beacons3.gvt2.com/domainreliability/upload", -- "https://beacons4.gvt2.com/domainreliability/upload", -- "https://beacons5.gvt2.com/domainreliability/upload", -- "https://beacons5.gvt3.com/domainreliability/upload", -- "https://clients2.google.com/domainreliability/upload", --}; -- --const char* const kGoogleOriginSpecificCollectorPathString = -- "/domainreliability/upload"; -- --static std::unique_ptr CreateGoogleConfig( -- const GoogleConfigParams& params, -- bool is_www) { -- if (is_www) -- DCHECK(params.duplicate_for_www); -- -- std::string hostname = (is_www ? "www." : "") + std::string(params.hostname); -- bool include_subdomains = params.include_subdomains && !is_www; -- -- std::unique_ptr config( -- new DomainReliabilityConfig()); -- config->origin = GURL("https://" + hostname + "/"); -- config->include_subdomains = include_subdomains; -- config->collectors.clear(); -- if (params.include_origin_specific_collector) { -- GURL::Replacements replacements; -- replacements.SetPathStr(kGoogleOriginSpecificCollectorPathString); -- config->collectors.push_back( -- std::make_unique(config->origin.ReplaceComponents(replacements))); -- } -- for (size_t i = 0; i < base::size(kGoogleStandardCollectors); i++) -- config->collectors.push_back( -- std::make_unique(kGoogleStandardCollectors[i])); -- config->success_sample_rate = 0.05; -- config->failure_sample_rate = 1.00; -- config->path_prefixes.clear(); -- return config; --} -- --} // namespace -- - // static - void GetAllGoogleConfigs( - std::vector>* configs_out) { - configs_out->clear(); -- -- for (auto& params : kGoogleConfigs) { -- configs_out->push_back(CreateGoogleConfig(params, false)); -- if (params.duplicate_for_www) -- configs_out->push_back(CreateGoogleConfig(params, true)); -- } - } - - } // namespace domain_reliability ---- a/components/domain_reliability/uploader.cc -+++ b/components/domain_reliability/uploader.cc -@@ -82,7 +82,7 @@ class DomainReliabilityUploaderImpl - if (discard_uploads_) - discarded_upload_count_++; - -- if (discard_uploads_ || shutdown_) { -+ if (true) { - DVLOG(1) << "Discarding report instead of uploading."; - UploadResult result; - result.status = UploadResult::SUCCESS; ---- a/components/domain_reliability/bake_in_configs.py -+++ b/components/domain_reliability/bake_in_configs.py -@@ -490,7 +490,7 @@ def origin_is_whitelisted(origin): - domain = origin[8:-1] - else: - return False -- return any(domain == e or domain.endswith('.' + e) for e in DOMAIN_WHITELIST) -+ return False - - - def quote_and_wrap_text(text, width=79, prefix=' "', suffix='"'): ---- a/components/domain_reliability/BUILD.gn -+++ b/components/domain_reliability/BUILD.gn -@@ -9,26 +9,6 @@ action("bake_in_configs") { - script = "bake_in_configs.py" - - inputs = [ -- "baked_in_configs/c_android_clients_google_com.json", -- "baked_in_configs/c_bigcache_googleapis_com.json", -- "baked_in_configs/c_doc-0-0-sj_sj_googleusercontent_com.json", -- "baked_in_configs/c_docs_google_com.json", -- "baked_in_configs/c_drive_google_com.json", -- "baked_in_configs/c_googlesyndication_com.json", -- "baked_in_configs/c_pack_google_com.json", -- "baked_in_configs/c_play_google_com.json", -- "baked_in_configs/c_youtube_com.json", -- "baked_in_configs/clients2_google_com.json", -- "baked_in_configs/docs_google_com.json", -- "baked_in_configs/gcp_gvt2_com.json", -- "baked_in_configs/gcp_gvt6_com.json", -- "baked_in_configs/google-analytics_com.json", -- "baked_in_configs/googlevideo_com.json", -- "baked_in_configs/gvt1_com.json", -- "baked_in_configs/gvt2_com.json", -- "baked_in_configs/gvt6_com.json", -- "baked_in_configs/ssl_gstatic_com.json", -- "baked_in_configs/www_google_com.json", - ] - - output_file = "$target_gen_dir/baked_in_configs.cc" -@@ -38,13 +18,21 @@ action("bake_in_configs") { - - # The JSON file list is too long for the command line on Windows, so put - # them in a response file. -- response_file_contents = rebase_path(inputs, root_build_dir) -- args = [ -- "--file-list", -- "{{response_file_name}}", -- "--output", -- rebase_path(output_file, root_build_dir), -- ] -+ if (is_win) { -+ args = [ -+ "--file-list", -+ "nul", -+ "--output", -+ rebase_path(output_file, root_build_dir), -+ ] -+ } else { -+ args = [ -+ "--file-list", -+ "/dev/null", -+ "--output", -+ rebase_path(output_file, root_build_dir), -+ ] -+ } - } - - jumbo_component("domain_reliability") { diff --git a/testing/chromium/patches/disable-download-quarantine.patch b/testing/chromium/patches/disable-download-quarantine.patch deleted file mode 100644 index 07715cde..00000000 --- a/testing/chromium/patches/disable-download-quarantine.patch +++ /dev/null @@ -1,98 +0,0 @@ -# Disables file download quarantining - ---- a/content/browser/renderer_host/pepper/pepper_file_io_host.cc -+++ b/content/browser/renderer_host/pepper/pepper_file_io_host.cc -@@ -432,7 +432,7 @@ void PepperFileIOHost::OnLocalFileOpened - ppapi::host::ReplyMessageContext reply_context, - const base::FilePath& path, - base::File::Error error_code) { --#if defined(OS_WIN) || defined(OS_LINUX) -+#if 0 - // Quarantining a file before its contents are available is only supported on - // Windows and Linux. - if (!FileOpenForWrite(open_flags_) || error_code != base::File::FILE_OK) { -@@ -452,7 +452,7 @@ void PepperFileIOHost::OnLocalFileOpened - #endif - } - --#if defined(OS_WIN) || defined(OS_LINUX) -+#if 0 - void PepperFileIOHost::OnLocalFileQuarantined( - ppapi::host::ReplyMessageContext reply_context, - const base::FilePath& path, ---- a/content/browser/renderer_host/pepper/pepper_file_io_host.h -+++ b/content/browser/renderer_host/pepper/pepper_file_io_host.h -@@ -15,7 +15,6 @@ - #include "base/macros.h" - #include "base/memory/ref_counted.h" - #include "base/memory/weak_ptr.h" --#include "components/download/quarantine/quarantine.h" - #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h" - #include "ipc/ipc_listener.h" - #include "ipc/ipc_platform_file.h" -@@ -92,10 +91,6 @@ class PepperFileIOHost : public ppapi::h - const base::FilePath& path, - base::File::Error error_code); - -- void OnLocalFileQuarantined(ppapi::host::ReplyMessageContext reply_context, -- const base::FilePath& path, -- download::QuarantineFileResult quarantine_result); -- - void SendFileOpenReply(ppapi::host::ReplyMessageContext reply_context, - base::File::Error error_code); - ---- a/components/download/internal/common/base_file.cc -+++ b/components/download/internal/common/base_file.cc -@@ -22,7 +22,6 @@ - #include "components/download/public/common/download_interrupt_reasons_utils.h" - #include "components/download/public/common/download_item.h" - #include "components/download/public/common/download_stats.h" --#include "components/download/quarantine/quarantine.h" - #include "crypto/secure_hash.h" - - #if defined(OS_ANDROID) -@@ -494,7 +493,7 @@ DownloadInterruptReason BaseFile::Publis - } - #endif // defined(OS_ANDROID) - --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if 0 - - namespace { - -@@ -578,7 +577,7 @@ DownloadInterruptReason BaseFile::Annota - } - return DOWNLOAD_INTERRUPT_REASON_FILE_FAILED; - } --#else // !OS_WIN && !OS_MACOSX && !OS_LINUX -+#else // 1 - DownloadInterruptReason BaseFile::AnnotateWithSourceInformation( - const std::string& client_guid, - const GURL& source_url, ---- a/components/download/quarantine/quarantine.cc -+++ b/components/download/quarantine/quarantine.cc -@@ -6,8 +6,6 @@ - - #include "build/build_config.h" - --#if !defined(OS_WIN) && !defined(OS_MACOSX) -- - namespace download { - - QuarantineFileResult QuarantineFile(const base::FilePath& file, -@@ -18,5 +16,3 @@ QuarantineFileResult QuarantineFile(cons - } - - } // namespace download -- --#endif // !WIN && !MAC ---- a/content/browser/BUILD.gn -+++ b/content/browser/BUILD.gn -@@ -51,7 +51,6 @@ jumbo_source_set("browser") { - "//components/discardable_memory/service", - "//components/download/database", - "//components/download/public/common:public", -- "//components/download/quarantine", - "//components/filename_generation", - "//components/link_header_util", - "//components/metrics", diff --git a/testing/chromium/patches/disable-fetching-field-trials.patch b/testing/chromium/patches/disable-fetching-field-trials.patch deleted file mode 100644 index 46de6540..00000000 --- a/testing/chromium/patches/disable-fetching-field-trials.patch +++ /dev/null @@ -1,66 +0,0 @@ -# NOTE: Modified to remove usage of compiler #if macros -From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Sun, 8 Jul 2018 18:16:34 +0200 -Subject: Disable fetching of all field trials - ---- - .../src/org/chromium/chrome/browser/ChromeFeatureList.java | 12 +++--------- - components/variations/service/variations_service.cc | 4 ++++ - 2 files changed, 7 insertions(+), 9 deletions(-) - ---- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java -@@ -106,9 +106,7 @@ public abstract class ChromeFeatureList - */ - public static int getFieldTrialParamByFeatureAsInt( - String featureName, String paramName, int defaultValue) { -- if (sTestFeatures != null) return defaultValue; -- assert isInitialized(); -- return nativeGetFieldTrialParamByFeatureAsInt(featureName, paramName, defaultValue); -+ return defaultValue; - } - - /** -@@ -125,9 +123,7 @@ public abstract class ChromeFeatureList - */ - public static double getFieldTrialParamByFeatureAsDouble( - String featureName, String paramName, double defaultValue) { -- if (sTestFeatures != null) return defaultValue; -- assert isInitialized(); -- return nativeGetFieldTrialParamByFeatureAsDouble(featureName, paramName, defaultValue); -+ return defaultValue; - } - - /** -@@ -144,9 +140,7 @@ public abstract class ChromeFeatureList - */ - public static boolean getFieldTrialParamByFeatureAsBoolean( - String featureName, String paramName, boolean defaultValue) { -- if (sTestFeatures != null) return defaultValue; -- assert isInitialized(); -- return nativeGetFieldTrialParamByFeatureAsBoolean(featureName, paramName, defaultValue); -+ return defaultValue; - } - - // Alphabetical: ---- a/components/variations/service/variations_service.cc -+++ b/components/variations/service/variations_service.cc -@@ -240,17 +240,7 @@ bool GetInstanceManipulations(const net: - // Variations seed fetching is only enabled in official Chrome builds, if a URL - // is specified on the command line, and for testing. - bool IsFetchingEnabled() { --#if !defined(GOOGLE_CHROME_BUILD) -- if (!base::CommandLine::ForCurrentProcess()->HasSwitch( -- switches::kVariationsServerURL) && -- !g_should_fetch_for_testing) { -- DVLOG(1) -- << "Not performing repeated fetching in unofficial build without --" -- << switches::kVariationsServerURL << " specified."; -- return false; -- } --#endif -- return true; -+ return false; - } - - std::unique_ptr MaybeImportFirstRunSeed( diff --git a/testing/chromium/patches/disable-fonts-googleapis-references.patch b/testing/chromium/patches/disable-fonts-googleapis-references.patch deleted file mode 100644 index 045283ff..00000000 --- a/testing/chromium/patches/disable-fonts-googleapis-references.patch +++ /dev/null @@ -1,107 +0,0 @@ -# Disables references to fonts.googleapis.com - ---- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc -+++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc -@@ -309,7 +309,7 @@ bool DomDistillerViewerSource::ShouldSer - } - - std::string DomDistillerViewerSource::GetContentSecurityPolicyStyleSrc() const { -- return "style-src 'self' https://fonts.googleapis.com;"; -+ return "style-src 'self';"; - } - - std::string DomDistillerViewerSource::GetContentSecurityPolicyChildSrc() const { ---- a/components/dom_distiller/core/html/preview.html -+++ b/components/dom_distiller/core/html/preview.html -@@ -11,7 +11,7 @@ found in the LICENSE file. - - Title goes here and it could be kind of lengthy - Publisher name - -- -+ -