Update check-git-apply.yaml

.github/workflows/check-git-apply.yaml

@@ -0,0 +1,141 @@
+name: Check git apply
+#permissions:
+#  actions: none
+#  checks: none
+#  contents: none
+#  deployments: none
+#  issues: none
+#  packages: none
+#  pull-requests: write
+#  repository-projects: none
+#  security-events: none
+#  statuses: none
+  
+on:
+  push:
+    branches-ignore:
+      - 'ci'
+      
+  workflow_dispatch:
+    inputs:
+      rtag:
+        description: 'uazo/bromite TAG or COMMIT'
+        required: true
+        default: ''
+
+env:
+  RTAG: ${{ github.event.inputs.rtag }}  
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    
+      - name: "Get value from dispatch"
+        run: |
+          if [ -z "${RTAG}" ]; then
+            echo "RTAG=$GITHUB_SHA" >> $GITHUB_ENV
+            echo "RTAG=$RTAG"
+          fi
+          
+      - name: Prepare container
+        run: |
+          sudo apt update
+          sudo apt install -y wget unzip tar sed dos2unix patchutils wiggle curl
+          
+          wget https://github.com/uazo/superpatch/releases/latest/download/SuperPatchUtils.tar.gz
+          tar xfz SuperPatchUtils.tar.gz
+          rm SuperPatchUtils.tar.gz
+          
+          git clone https://github.com/uazo/bromite-buildtools
+          
+          wget https://github.com/ericchiang/pup/releases/download/v0.4.0/pup_v0.4.0_linux_amd64.zip
+          unzip pup_v0.4.0_linux_amd64.zip
+          rm pup_v0.4.0_linux_amd64.zip
+
+          BRANCH=$(curl https://github.com/uazo/bromite/branch_commits/$RTAG | ./pup -p li.branch:last-child a text{})
+          if [ -z "${BRANCH}" ]; then
+            BRANCH=$(curl https://github.com/uazo/bromite/branch_commits/$RTAG a | ./pup -p li.branch:first-child a text{})
+          fi
+          if [ -z "${BRANCH}" ]; then
+            echo "Impossible to recover the base commit"
+            exit 1
+          fi
+          echo "BRANCH=$BRANCH" >> $GITHUB_ENV
+
+      - name: Checkout 'uazo/bromite' ${{ env.BRANCH }}
+        uses: actions/checkout@v2
+        with:
+            repository: 'uazo/bromite'
+            ref: ${{ github.event.inputs.rtag }}
+            path: 'bromite'
+            fetch-depth: 1
+
+      - name: Check chromium version
+        run: |
+          VERSION=$(cat bromite/build/RELEASE)
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
+
+      - name: Download chromium ${{ env.VERSION }} sources
+        run: |
+          ./bin/SuperPatchUtils bromite $RTAG chromium/src
+          cd chromium/src
+          git init
+          git config user.email "you@example.com"
+          git config user.name "Your Name"
+          git add .
+          git commit -m $VERSION
+          git tag -a $VERSION -m $VERSION
+          cd ../..
+
+      - name: Apply patches ${{ github.event.inputs.rtag }}
+        run: |
+          export HOME=$(pwd)
+          cd ~/chromium/src
+          
+          export SILENT=true
+          export SKIPAUTOGENERATED=true
+          bash ~/bromite-buildtools/apply-all-patch.sh || exit 1
+          
+          rm -rf ~/bromite/build/patches-new/
+          rm ~/bromite/build/bromite_patches_list_new.txt
+          
+      - name: Export patches
+        run: |
+          export HOME=$(pwd)
+          
+          cd ~/chromium/src          
+          bash ~/bromite-buildtools/export-all-patch.sh
+          
+          cd ~/bromite
+          rm -rf build/patches/*
+          mv build/patches-new/* build/patches
+          rm -rf build/patches-new/
+          
+      - name: Check differences CHANGES=${{ env.CHANGES }}
+        run: |
+          cd bromite
+          CHANGES=0 && git diff --quiet || CHANGES=1
+          echo "CHANGES=$CHANGES" >> $GITHUB_ENV
+          
+          if [[ CHANGES -eq 1 ]]; then
+              git add build/patches/*.patch
+              git diff --name-only --staged
+              # MESSAGE=$(git diff --name-only --staged)
+              # echo "MESSAGE='$MESSAGE'" >> $GITHUB_ENV
+          fi
+          
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@dcd5fd746d53dd8de555c0f10bca6c35628be47a #v3.12.0
+        if: env.CHANGES == '1'
+        with:
+          path: bromite
+          base: ${{ env.BRANCH }}
+          #push-to-fork: uazo/bromite
+          add-paths: |
+            build/patches/*.patch
+          commit-message: 'AUTOMATED - git apply results'
+          title: Git apply result for ${{ env.BRANCH }} branch
+          body: ${{ env.MESSAGE }}
+          delete-branch: true
+          branch-suffix: short-commit-hash

.gitignore

@@ -0,0 +1,7 @@
+################################################################################
+# This .gitignore file was automatically created by Microsoft(R) Visual Studio.
+################################################################################
+
+*.sqlite
+/.vs/ProjectSettings.json
+/.vs

CHANGELOG.md

@@ -1,60 +0,0 @@
-# 63.0.3239.85
-* no suggest URL for DuckDuckGo (https://github.com/bromite/bromite/issues/19)
-* fixed 4chan blocking rule
-* limit AMP links cleanup to search results only (fixes broken images/news result tabs)
-* updated adBlock filters
-
-# 63.0.3239.78
-* correctly set version and build numbers
-* updated adBlock filters
-
-# 63.0.3239.73
-
-# 63.0.3239.64
-* updated adblock filters
-* fixed an issue with incognito new tab
-* permanent disable for ToS/metrics and unused auto-updates check
-
-# 63.0.3239.46
-* removed search engine geolocation default patch
-
-# 63.0.3239.38
-
-# 63.0.3239.27
-
-# 63.0.3239.24
-* convert AMP search results to regular search results
-
-# 63.0.3239.15
-* remove URL tracking from Google search results
-* disable webRTC by default (https://github.com/bromite/bromite/issues/9, still not working proper)
-* do not enable search engine geolocation by default
-* use own package name (closes https://github.com/bromite/bromite/issues/1)
-* use 64bit WebView process
-
-# 63.0.3239.10
-* attempt enabling API keys (didn't work)
-* added StartPage search engine (closes https://github.com/bromite/bromite/issues/3)
-
-# 63.0.3239.6
-* added Bromite patch for Google search results click-tracking removal
-* added x86 target CPU
-* fixed red blink frame
-
-# 63.0.3235.2
-* first release with NoChromo adblocking patch
-* Bromite patch: disable NTP remote suggestions
-* added some Inox/Iridium/Ungoogled-Chromium patches, namely:
-   * DuckDuckGo search engine
-   * disable battery status service
-   * disable formatting in OmniBox
-   * disable GCM status checks
-   * use local fonts instead of fonts from Google servers
-   * disable updater pings
-   * do not enable Google integrations by default (translation, lookup, etc)
-   * disable the ad promo system
-   * do not store passwords by default
-   * do not fetch Google promotions
-   * restore classic NTP
-   * only keep cookies until exit
-   * block third-party cookies

LICENSE

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -1,69 +0,0 @@
-# Bromite - Take back your browser
-
-[![GitHub release][version-image]][version-url] [![license][license-image]][license-url]
-
-<img title="Bromite - take back your browser!" src="https://www.bromite.org/android-icon-192x192.png" width="96" alt="Bromite" />
-
-Bromite is [Chromium](https://www.chromium.org/Home) plus some patches for ad blocking and enhanced privacy.
-
-Bromite is only available for Android v4 and above.
-
-See [open issues](https://github.com/bromite/bromite/issues) for the development in progress.
-
-# Donate
-
-Please donate to support development of Bromite and the costs for the build system.
-
-Support development with a donation of 3 EUR: [![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JP3XTQPVRNET2)
-
-Support development with a free amount donation: [![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=LC7Q6A3UAQPY8)
-
-BTC donations address: `3MkC3idL61npQSCxL1gceksmRTkNkiCPcG`
-
-ETH donations address: `0xf47ff39223d828f99fec5ab53bd068c5c0522042`
-
-# Features
-
-* adblocking (currently baked-in, no configuration options available)
-* remove click-tracking and AMP from Google search results
-* [StartPage](https://startpage.com/) search engine (select it from search engines under settings)
-* [DuckDuckGo](https://duckduckgo.com/) search engine (select it from search engines under settings)
-* privacy enhancement patches from Inox patchset, ungoogled-chromium and Iridium projects
-* all codecs included (proprietary, open H.264 etc.)
-* built with official Chrome optimizations
-
-# F.A.Q.
-
-## Does Google Sync work?
-No. You would have to use your own API keys, which I do not know how you could pass via environment variables on Android.
-This is not a limitation of Bromite but of all Chromium-based projects in general, as general public is not allowed to use Google's APIs for free unless when using Chrome.
-
-# Releases
-
-A build server goes through the very lengthy build operation and then new versions are available in this project as [releases](https://github.com/bromite/bromite/releases).
-
-Each tag corresponds to a Chromium release tag.
-
-# How to build
-
-The [bromite main repository](https://github.com/bromite/bromite) contains tags for each corresponding Chromium release (see https://chromium.googlesource.com/chromium/src.git).
-
-Please refer to [official Chromium build documentation](https://www.chromium.org/developers/how-tos/get-the-code) to get started on how to build Chromium; if you can build Chromium for Android, you can build Bromite.
-
-# Credits
-
-* [Chromium project](https://www.chromium.org/Home) and developers
-* [ungoogled-chromium](https://github.com/Eloston/ungoogled-chromium) for some patches
-* [Iridium project](https://github.com/iridium-browser) for some patches (taken from above ungoogled-chromium)
-* [Inox patchset](https://github.com/gcarq/inox-patchset) for some patches (taken from above ungoogled-chromium)
-* nochromo for the original adblock patch
-* AdBlock Plus, uBlock, EasyList and EasyPrivacy for the compilation of original adblock patch
-
-# License
-
-The patches published as part of the Bromite project are released under [GNU GPL v3](./LICENSE).
-
-[version-image]: https://img.shields.io/github/release/bromite/bromite.svg?style=flat-square
-[version-url]: https://github.com/bromite/bromite/releases/latest
-[license-image]: https://img.shields.io/github/license/bromite/bromite.svg
-[license-url]: https://github.com/bromite/bromite/blob/master/LICENSE

patches/performance/0012-use-64-bit-WebView-processes.patch

@@ -1,26 +0,0 @@
-From ee80624a6cad6e19a281a59cfea32f406e7ee03d Mon Sep 17 00:00:00 2001
-From: Daniel Micay <danielmicay@gmail.com>
-Date: Thu, 26 Jan 2017 01:30:12 -0500
-Subject: [PATCH 12/21] use 64-bit WebView processes
-
----
- android_webview/apk/java/AndroidManifest.xml | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/android_webview/apk/java/AndroidManifest.xml b/android_webview/apk/java/AndroidManifest.xml
-index 23b55ecb437a..3f7212fe2807 100644
---- a/android_webview/apk/java/AndroidManifest.xml
-+++ b/android_webview/apk/java/AndroidManifest.xml
-@@ -20,8 +20,7 @@
- 
-     <application android:label="Android System WebView"
-                  android:icon="@drawable/icon_webview"
--                 android:multiArch="true"
--                 android:use32bitAbi="true">
-+                 android:multiArch="true">
-         {# This part is shared between stand-alone WebView and Monochrome #}
-         {% macro common(manifest_package, webview_lib) %}
-             <meta-data android:name="com.android.webview.WebViewLibrary"
--- 
-2.14.2
-

patches/privacy/add-duckduckgo.patch

@@ -1,707 +0,0 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Thu Oct 12 11:06:18 2017 +0200
-
-    Add DuckDuckGo search engine, not enabled by default
-
-diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
-index 002b6c0..7b4155b 100644
---- a/components/search_engines/prepopulated_engines.json
-+++ b/components/search_engines/prepopulated_engines.json
-@@ -32,12 +32,22 @@
- 
-     // Increment this if you change the data in ways that mean users with
-     // existing data should get a new version.
--    "kCurrentDataVersion": 99
-+    "kCurrentDataVersion": 100
-   },
- 
-   // The following engines are included in country lists and are added to the
-   // list of search engines on the first run depending on user's country.
-   "elements": {
-+    "duckduckgo": {
-+      "name": "DuckDuckGo",
-+      "keyword": "duckduckgo.com",
-+      "favicon_url": "https://duckduckgo.com/favicon.ico",
-+      "search_url": "https://duckduckgo.com/?q={searchTerms}",
-+      "new_tab_url": "https://duckduckgo.com/",
-+      "type": "SEARCH_ENGINE_DUCKDUCKGO",
-+      "id": 11
-+    },
-+
-     "aol": {
-       "name": "AOL",
-       "keyword": "aol.com",
-diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h
-index c19dd0e..02f6b16 100644
---- a/components/search_engines/search_engine_type.h
-+++ b/components/search_engines/search_engine_type.h
-@@ -63,6 +63,7 @@ enum SearchEngineType {
-   SEARCH_ENGINE_YANDEX,
-   SEARCH_ENGINE_ZOZNAM,
-   SEARCH_ENGINE_360,
-+  SEARCH_ENGINE_DUCKDUCKGO,
-   SEARCH_ENGINE_MAX          // Bounding value needed for UMA histogram macro.
- };
- 
-diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
-index 6be17ee..ef50529 100644
---- a/components/search_engines/template_url_prepopulate_data.cc
-+++ b/components/search_engines/template_url_prepopulate_data.cc
-@@ -50,548 +50,548 @@ namespace {
- 
- // Default (for countries with no better engine set)
- const PrepopulatedEngine* const engines_default[] = {
--    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // United Arab Emirates
- const PrepopulatedEngine* const engines_AE[] = {
--    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Albania
- const PrepopulatedEngine* const engines_AL[] = {
--    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Argentina
- const PrepopulatedEngine* const engines_AR[] = {
--    &google, &bing, &yahoo_ar,
-+    &google, &duckduckgo, &bing, &yahoo_ar,
- };
- 
- // Austria
- const PrepopulatedEngine* const engines_AT[] = {
--    &google, &bing, &yahoo_at,
-+    &google, &duckduckgo, &bing, &yahoo_at,
- };
- 
- // Australia
- const PrepopulatedEngine* const engines_AU[] = {
--    &google, &bing, &yahoo_au,
-+    &google, &duckduckgo, &bing, &yahoo_au,
- };
- 
- // Bosnia and Herzegovina
- const PrepopulatedEngine* const engines_BA[] = {
--    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Belgium
- const PrepopulatedEngine* const engines_BE[] = {
--    &google, &bing, &yahoo, &yahoo_fr,
-+    &google, &duckduckgo, &bing, &yahoo, &yahoo_fr,
- };
- 
- // Bulgaria
- const PrepopulatedEngine* const engines_BG[] = {
--    &google, &bing, &ask,
-+    &google, &duckduckgo, &bing, &ask,
- };
- 
- // Bahrain
- const PrepopulatedEngine* const engines_BH[] = {
--    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Burundi
- const PrepopulatedEngine* const engines_BI[] = {
--    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Brunei
- const PrepopulatedEngine* const engines_BN[] = {
--    &google, &yahoo_my, &bing,
-+    &google, &duckduckgo, &yahoo_my, &bing,
- };
- 
- // Bolivia
- const PrepopulatedEngine* const engines_BO[] = {
--    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Brazil
- const PrepopulatedEngine* const engines_BR[] = {
--    &google, &ask_br, &bing, &yahoo_br,
-+    &google, &duckduckgo, &ask_br, &bing, &yahoo_br,
- };
- 
- // Belarus
- const PrepopulatedEngine* const engines_BY[] = {
--    &google, &yandex_by, &mail_ru,
-+    &google, &duckduckgo, &yandex_by, &mail_ru,
- };
- 
- // Belize
- const PrepopulatedEngine* const engines_BZ[] = {
--    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Canada
- const PrepopulatedEngine* const engines_CA[] = {
--    &google, &bing, &ask, &yahoo_ca, &yahoo_qc,
-+    &google, &duckduckgo, &bing, &ask, &yahoo_ca, &yahoo_qc,
- };
- 
- // Switzerland
- const PrepopulatedEngine* const engines_CH[] = {
--    &google, &bing, &yahoo_ch,
-+    &google, &duckduckgo, &bing, &yahoo_ch,
- };
- 
- // Chile
- const PrepopulatedEngine* const engines_CL[] = {
--    &google, &bing, &yahoo_cl,
-+    &google, &duckduckgo, &bing, &yahoo_cl,
- };
- 
- // China
- const PrepopulatedEngine* const engines_CN[] = {
--    &google, &baidu, &sogou, &so_360,
-+    &google, &duckduckgo, &baidu, &sogou, &so_360,
- };
- 
- // Colombia
- const PrepopulatedEngine* const engines_CO[] = {
--    &google, &bing, &yahoo_co,
-+    &google, &duckduckgo, &bing, &yahoo_co,
- };
- 
- // Costa Rica
- const PrepopulatedEngine* const engines_CR[] = {
--    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Czech Republic
- const PrepopulatedEngine* const engines_CZ[] = {
--    &google, &seznam, &bing,
-+    &google, &duckduckgo, &seznam, &bing,
- };
- 
- // Germany
- const PrepopulatedEngine* const engines_DE[] = {
--    &google, &bing, &yahoo_de,
-+    &google, &duckduckgo, &bing, &yahoo_de,
- };
- 
- // Denmark
- const PrepopulatedEngine* const engines_DK[] = {
--    &google, &bing, &yahoo_dk,
-+    &google, &duckduckgo, &bing, &yahoo_dk,
- };
- 
- // Dominican Republic
- const PrepopulatedEngine* const engines_DO[] = {
--    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Algeria
- const PrepopulatedEngine* const engines_DZ[] = {
--    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // Ecuador
- const PrepopulatedEngine* const engines_EC[] = {
--    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Estonia
- const PrepopulatedEngine* const engines_EE[] = {
--    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Egypt
- const PrepopulatedEngine* const engines_EG[] = {
--    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Spain
- const PrepopulatedEngine* const engines_ES[] = {
--    &google, &bing, &yahoo_es,
-+    &google, &duckduckgo, &bing, &yahoo_es,
- };
- 
- // Faroe Islands
- const PrepopulatedEngine* const engines_FO[] = {
--    &google, &bing, &ask,
-+    &google, &duckduckgo, &bing, &ask,
- };
- 
- // Finland
- const PrepopulatedEngine* const engines_FI[] = {
--    &google, &bing, &yahoo_fi,
-+    &google, &duckduckgo, &bing, &yahoo_fi,
- };
- 
- // France
- const PrepopulatedEngine* const engines_FR[] = {
--    &google, &bing, &yahoo_fr,
-+    &google, &duckduckgo, &bing, &yahoo_fr,
- };
- 
- // United Kingdom
- const PrepopulatedEngine* const engines_GB[] = {
--    &google, &bing, &yahoo_uk, &ask_uk,
-+    &google, &duckduckgo, &bing, &yahoo_uk, &ask_uk,
- };
- 
- // Greece
- const PrepopulatedEngine* const engines_GR[] = {
--    &google, &bing, &yahoo_gr,
-+    &google, &duckduckgo, &bing, &yahoo_gr,
- };
- 
- // Guatemala
- const PrepopulatedEngine* const engines_GT[] = {
--    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Hong Kong
- const PrepopulatedEngine* const engines_HK[] = {
--    &google, &yahoo_hk, &baidu, &bing,
-+    &google, &duckduckgo, &yahoo_hk, &baidu, &bing,
- };
- 
- // Honduras
- const PrepopulatedEngine* const engines_HN[] = {
--    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Croatia
- const PrepopulatedEngine* const engines_HR[] = {
--    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Hungary
- const PrepopulatedEngine* const engines_HU[] = {
--    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Indonesia
- const PrepopulatedEngine* const engines_ID[] = {
--    &google, &yahoo_id, &bing,
-+    &google, &duckduckgo, &yahoo_id, &bing,
- };
- 
- // Ireland
- const PrepopulatedEngine* const engines_IE[] = {
--    &google, &bing, &yahoo_uk,
-+    &google, &duckduckgo, &bing, &yahoo_uk,
- };
- 
- // Israel
- const PrepopulatedEngine* const engines_IL[] = {
--    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // India
- const PrepopulatedEngine* const engines_IN[] = {
--    &google, &bing, &yahoo_in,
-+    &google, &duckduckgo, &bing, &yahoo_in,
- };
- 
- // Iraq
- const PrepopulatedEngine* const engines_IQ[] = {
--    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Iran
- const PrepopulatedEngine* const engines_IR[] = {
--    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Iceland
- const PrepopulatedEngine* const engines_IS[] = {
--    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Italy
- const PrepopulatedEngine* const engines_IT[] = {
--    &google, &virgilio, &bing,
-+    &google, &duckduckgo, &virgilio, &bing,
- };
- 
- // Jamaica
- const PrepopulatedEngine* const engines_JM[] = {
--    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Jordan
- const PrepopulatedEngine* const engines_JO[] = {
--    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Japan
- const PrepopulatedEngine* const engines_JP[] = {
--    &google, &yahoo_jp, &bing,
-+    &google, &duckduckgo, &yahoo_jp, &bing,
- };
- 
- // Kenya
- const PrepopulatedEngine* const engines_KE[] = {
--    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Kuwait
- const PrepopulatedEngine* const engines_KW[] = {
--    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // South Korea
- const PrepopulatedEngine* const engines_KR[] = {
--    &google, &naver, &daum,
-+    &google, &duckduckgo, &naver, &daum,
- };
- 
- // Kazakhstan
- const PrepopulatedEngine* const engines_KZ[] = {
--    &google, &mail_ru, &yandex_kz,
-+    &google, &duckduckgo, &mail_ru, &yandex_kz,
- };
- 
- // Lebanon
- const PrepopulatedEngine* const engines_LB[] = {
--    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Liechtenstein
- const PrepopulatedEngine* const engines_LI[] = {
--    &google, &bing, &yahoo_de,
-+    &google, &duckduckgo, &bing, &yahoo_de,
- };
- 
- // Lithuania
- const PrepopulatedEngine* const engines_LT[] = {
--    &google, &bing, &yandex_ru,
-+    &google, &duckduckgo, &bing, &yandex_ru,
- };
- 
- // Luxembourg
- const PrepopulatedEngine* const engines_LU[] = {
--    &google, &bing, &yahoo_fr,
-+    &google, &duckduckgo, &bing, &yahoo_fr,
- };
- 
- // Latvia
- const PrepopulatedEngine* const engines_LV[] = {
--    &google, &yandex_ru, &bing,
-+    &google, &duckduckgo, &yandex_ru, &bing,
- };
- 
- // Libya
- const PrepopulatedEngine* const engines_LY[] = {
--    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Morocco
- const PrepopulatedEngine* const engines_MA[] = {
--    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // Monaco
- const PrepopulatedEngine* const engines_MC[] = {
--    &google, &yahoo_fr, &bing,
-+    &google, &duckduckgo, &yahoo_fr, &bing,
- };
- 
- // Moldova
- const PrepopulatedEngine* const engines_MD[] = {
--    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Montenegro
- const PrepopulatedEngine* const engines_ME[] = {
--    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Macedonia
- const PrepopulatedEngine* const engines_MK[] = {
--    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Mexico
- const PrepopulatedEngine* const engines_MX[] = {
--    &google, &bing, &yahoo_mx,
-+    &google, &duckduckgo, &bing, &yahoo_mx,
- };
- 
- // Malaysia
- const PrepopulatedEngine* const engines_MY[] = {
--    &google, &yahoo_my, &bing,
-+    &google, &duckduckgo, &yahoo_my, &bing,
- };
- 
- // Nicaragua
- const PrepopulatedEngine* const engines_NI[] = {
--    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Netherlands
- const PrepopulatedEngine* const engines_NL[] = {
--    &google, &yahoo_nl, &vinden,
-+    &google, &duckduckgo, &yahoo_nl, &vinden,
- };
- 
- // Norway
- const PrepopulatedEngine* const engines_NO[] = {
--    &google, &bing, &kvasir,
-+    &google, &duckduckgo, &bing, &kvasir,
- };
- 
- // New Zealand
- const PrepopulatedEngine* const engines_NZ[] = {
--    &google, &bing, &yahoo_nz,
-+    &google, &duckduckgo, &bing, &yahoo_nz,
- };
- 
- // Oman
- const PrepopulatedEngine* const engines_OM[] = {
--    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // Panama
- const PrepopulatedEngine* const engines_PA[] = {
--    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Peru
- const PrepopulatedEngine* const engines_PE[] = {
--    &google, &bing, &yahoo_pe,
-+    &google, &duckduckgo, &bing, &yahoo_pe,
- };
- 
- // Philippines
- const PrepopulatedEngine* const engines_PH[] = {
--    &google, &yahoo_ph, &bing,
-+    &google, &duckduckgo, &yahoo_ph, &bing,
- };
- 
- // Pakistan
- const PrepopulatedEngine* const engines_PK[] = {
--    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Puerto Rico
- const PrepopulatedEngine* const engines_PR[] = {
--    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Poland
- const PrepopulatedEngine* const engines_PL[] = {
--    &google, &onet, &bing,
-+    &google, &duckduckgo, &onet, &bing,
- };
- 
- // Portugal
- const PrepopulatedEngine* const engines_PT[] = {
--    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Paraguay
- const PrepopulatedEngine* const engines_PY[] = {
--    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Qatar
- const PrepopulatedEngine* const engines_QA[] = {
--    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Romania
- const PrepopulatedEngine* const engines_RO[] = {
--    &google, &yahoo_ro, &bing,
-+    &google, &duckduckgo, &yahoo_ro, &bing,
- };
- 
- // Serbia
- const PrepopulatedEngine* const engines_RS[] = {
--    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Russia
- const PrepopulatedEngine* const engines_RU[] = {
--    &google, &yandex_ru, &mail_ru,
-+    &google, &duckduckgo, &yandex_ru, &mail_ru,
- };
- 
- // Rwanda
- const PrepopulatedEngine* const engines_RW[] = {
--    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Saudi Arabia
- const PrepopulatedEngine* const engines_SA[] = {
--    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Sweden
- const PrepopulatedEngine* const engines_SE[] = {
--    &google, &bing, &yahoo_se,
-+    &google, &duckduckgo, &bing, &yahoo_se,
- };
- 
- // Singapore
- const PrepopulatedEngine* const engines_SG[] = {
--    &google, &yahoo_sg, &bing,
-+    &google, &duckduckgo, &yahoo_sg, &bing,
- };
- 
- // Slovenia
- const PrepopulatedEngine* const engines_SI[] = {
--    &google, &najdi, &ask,
-+    &google, &duckduckgo, &najdi, &ask,
- };
- 
- // Slovakia
- const PrepopulatedEngine* const engines_SK[] = {
--    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // El Salvador
- const PrepopulatedEngine* const engines_SV[] = {
--    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Syria
- const PrepopulatedEngine* const engines_SY[] = {
--    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // Thailand
- const PrepopulatedEngine* const engines_TH[] = {
--    &google, &yahoo_th, &bing,
-+    &google, &duckduckgo, &yahoo_th, &bing,
- };
- 
- // Tunisia
- const PrepopulatedEngine* const engines_TN[] = {
--    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // Turkey
- const PrepopulatedEngine* const engines_TR[] = {
--    &google, &bing, &yahoo_tr, &yandex_tr,
-+    &google, &duckduckgo, &bing, &yahoo_tr, &yandex_tr,
- };
- 
- // Trinidad and Tobago
- const PrepopulatedEngine* const engines_TT[] = {
--    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Taiwan
- const PrepopulatedEngine* const engines_TW[] = {
--    &google, &yahoo_tw, &bing,
-+    &google, &duckduckgo, &yahoo_tw, &bing,
- };
- 
- // Tanzania
- const PrepopulatedEngine* const engines_TZ[] = {
--    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Ukraine
- const PrepopulatedEngine* const engines_UA[] = {
--    &google, &yandex_ua, &bing,
-+    &google, &duckduckgo, &yandex_ua, &bing,
- };
- 
- // United States
- const PrepopulatedEngine* const engines_US[] = {
--    &google, &bing, &yahoo, &aol, &ask,
-+    &google, &duckduckgo, &bing, &yahoo, &aol, &ask,
- };
- 
- // Uruguay
- const PrepopulatedEngine* const engines_UY[] = {
--    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Venezuela
- const PrepopulatedEngine* const engines_VE[] = {
--    &google, &bing, &yahoo_ve,
-+    &google, &duckduckgo, &bing, &yahoo_ve,
- };
- 
- // Vietnam
- const PrepopulatedEngine* const engines_VN[] = {
--    &google, &yahoo_vn, &bing,
-+    &google, &duckduckgo, &yahoo_vn, &bing,
- };
- 
- // Yemen
- const PrepopulatedEngine* const engines_YE[] = {
--    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // South Africa
- const PrepopulatedEngine* const engines_ZA[] = {
--    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Zimbabwe
- const PrepopulatedEngine* const engines_ZW[] = {
--    &google, &bing, &yahoo, &ask,
-+    &google, &duckduckgo, &bing, &yahoo, &ask,
- };
- 
- // A list of all the engines that we know about.
- const PrepopulatedEngine* const kAllEngines[] = {
-     // Prepopulated engines:
--    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &google, &kvasir,
-+    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &google, &duckduckgo, &kvasir,
-     &mail_ru, &najdi, &naver, &onet, &seznam, &sogou, &vinden, &virgilio,
-     &yahoo, &yahoo_ar, &yahoo_at, &yahoo_au, &yahoo_br, &yahoo_ca, &yahoo_ch,
-     &yahoo_cl, &yahoo_co, &yahoo_de, &yahoo_dk, &yahoo_es, &yahoo_fi, &yahoo_fr,

patches/privacy/add-startpage.patch

@@ -1,710 +0,0 @@
-commit 8885c3f6f759c0d97183fe44913e2c4ca1839220
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Oct 18 21:24:05 2017 +0200
-
-    Add StartPage search engine
-
-diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
-index 25e85ab..dcccdb8 100644
---- a/components/search_engines/prepopulated_engines.json
-+++ b/components/search_engines/prepopulated_engines.json
-@@ -32,7 +32,7 @@
- 
-     // Increment this if you change the data in ways that mean users with
-     // existing data should get a new version.
--    "kCurrentDataVersion": 100
-+    "kCurrentDataVersion": 101
-   },
- 
-   // The following engines are included in country lists and are added to the
-@@ -220,6 +220,16 @@
-       "id": 56
-     },
- 
-+    "startpage": {
-+      "name": "StartPage",
-+      "keyword": "startpage.com",
-+      "favicon_url": "https://startpage.com/favicon.ico",
-+      "search_url": "https://startpage.com/do/dsearch?query={searchTerms}",
-+      "new_tab_url": "https://startpage.com/",
-+      "type": "SEARCH_ENGINE_STARTPAGE",
-+      "id": 12
-+    },
-+
-     "vinden": {
-       "name": "Vinden.nl",
-       "keyword": "vinden.nl",
-diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h
-index 02f6b16..8df48741 100644
---- a/components/search_engines/search_engine_type.h
-+++ b/components/search_engines/search_engine_type.h
-@@ -64,6 +64,7 @@ enum SearchEngineType {
-   SEARCH_ENGINE_ZOZNAM,
-   SEARCH_ENGINE_360,
-   SEARCH_ENGINE_DUCKDUCKGO,
-+  SEARCH_ENGINE_STARTPAGE,
-   SEARCH_ENGINE_MAX          // Bounding value needed for UMA histogram macro.
- };
- 
-diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
-index 7adede7..52743e7 100644
---- a/components/search_engines/template_url_prepopulate_data.cc
-+++ b/components/search_engines/template_url_prepopulate_data.cc
-@@ -50,548 +50,548 @@ namespace {
- 
- // Default (for countries with no better engine set)
- const PrepopulatedEngine* const engines_default[] = {
--    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // United Arab Emirates
- const PrepopulatedEngine* const engines_AE[] = {
--    &google, &duckduckgo, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Albania
- const PrepopulatedEngine* const engines_AL[] = {
--    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Argentina
- const PrepopulatedEngine* const engines_AR[] = {
--    &google, &duckduckgo, &bing, &yahoo_ar,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_ar,
- };
- 
- // Austria
- const PrepopulatedEngine* const engines_AT[] = {
--    &google, &duckduckgo, &bing, &yahoo_at,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_at,
- };
- 
- // Australia
- const PrepopulatedEngine* const engines_AU[] = {
--    &google, &duckduckgo, &bing, &yahoo_au,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_au,
- };
- 
- // Bosnia and Herzegovina
- const PrepopulatedEngine* const engines_BA[] = {
--    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Belgium
- const PrepopulatedEngine* const engines_BE[] = {
--    &google, &duckduckgo, &bing, &yahoo, &yahoo_fr,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo, &yahoo_fr,
- };
- 
- // Bulgaria
- const PrepopulatedEngine* const engines_BG[] = {
--    &google, &duckduckgo, &bing, &ask,
-+    &google, &startpage, &duckduckgo, &bing, &ask,
- };
- 
- // Bahrain
- const PrepopulatedEngine* const engines_BH[] = {
--    &google, &duckduckgo, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Burundi
- const PrepopulatedEngine* const engines_BI[] = {
--    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Brunei
- const PrepopulatedEngine* const engines_BN[] = {
--    &google, &duckduckgo, &yahoo_my, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_my, &bing,
- };
- 
- // Bolivia
- const PrepopulatedEngine* const engines_BO[] = {
--    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Brazil
- const PrepopulatedEngine* const engines_BR[] = {
--    &google, &duckduckgo, &ask_br, &bing, &yahoo_br,
-+    &google, &startpage, &duckduckgo, &ask_br, &bing, &yahoo_br,
- };
- 
- // Belarus
- const PrepopulatedEngine* const engines_BY[] = {
--    &google, &duckduckgo, &yandex_by, &mail_ru,
-+    &google, &startpage, &duckduckgo, &yandex_by, &mail_ru,
- };
- 
- // Belize
- const PrepopulatedEngine* const engines_BZ[] = {
--    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Canada
- const PrepopulatedEngine* const engines_CA[] = {
--    &google, &duckduckgo, &bing, &ask, &yahoo_ca, &yahoo_qc,
-+    &google, &startpage, &duckduckgo, &bing, &ask, &yahoo_ca, &yahoo_qc,
- };
- 
- // Switzerland
- const PrepopulatedEngine* const engines_CH[] = {
--    &google, &duckduckgo, &bing, &yahoo_ch,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_ch,
- };
- 
- // Chile
- const PrepopulatedEngine* const engines_CL[] = {
--    &google, &duckduckgo, &bing, &yahoo_cl,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_cl,
- };
- 
- // China
- const PrepopulatedEngine* const engines_CN[] = {
--    &google, &duckduckgo, &baidu, &sogou, &so_360,
-+    &google, &startpage, &duckduckgo, &baidu, &sogou, &so_360,
- };
- 
- // Colombia
- const PrepopulatedEngine* const engines_CO[] = {
--    &google, &duckduckgo, &bing, &yahoo_co,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_co,
- };
- 
- // Costa Rica
- const PrepopulatedEngine* const engines_CR[] = {
--    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Czech Republic
- const PrepopulatedEngine* const engines_CZ[] = {
--    &google, &duckduckgo, &seznam, &bing,
-+    &google, &startpage, &duckduckgo, &seznam, &bing,
- };
- 
- // Germany
- const PrepopulatedEngine* const engines_DE[] = {
--    &google, &duckduckgo, &bing, &yahoo_de,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_de,
- };
- 
- // Denmark
- const PrepopulatedEngine* const engines_DK[] = {
--    &google, &duckduckgo, &bing, &yahoo_dk,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_dk,
- };
- 
- // Dominican Republic
- const PrepopulatedEngine* const engines_DO[] = {
--    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Algeria
- const PrepopulatedEngine* const engines_DZ[] = {
--    &google, &duckduckgo, &bing, &yahoo_maktoob,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // Ecuador
- const PrepopulatedEngine* const engines_EC[] = {
--    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Estonia
- const PrepopulatedEngine* const engines_EE[] = {
--    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Egypt
- const PrepopulatedEngine* const engines_EG[] = {
--    &google, &duckduckgo, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Spain
- const PrepopulatedEngine* const engines_ES[] = {
--    &google, &duckduckgo, &bing, &yahoo_es,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_es,
- };
- 
- // Faroe Islands
- const PrepopulatedEngine* const engines_FO[] = {
--    &google, &duckduckgo, &bing, &ask,
-+    &google, &startpage, &duckduckgo, &bing, &ask,
- };
- 
- // Finland
- const PrepopulatedEngine* const engines_FI[] = {
--    &google, &duckduckgo, &bing, &yahoo_fi,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_fi,
- };
- 
- // France
- const PrepopulatedEngine* const engines_FR[] = {
--    &google, &duckduckgo, &bing, &yahoo_fr,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_fr,
- };
- 
- // United Kingdom
- const PrepopulatedEngine* const engines_GB[] = {
--    &google, &duckduckgo, &bing, &yahoo_uk, &ask_uk,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_uk, &ask_uk,
- };
- 
- // Greece
- const PrepopulatedEngine* const engines_GR[] = {
--    &google, &duckduckgo, &bing, &yahoo_gr,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_gr,
- };
- 
- // Guatemala
- const PrepopulatedEngine* const engines_GT[] = {
--    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Hong Kong
- const PrepopulatedEngine* const engines_HK[] = {
--    &google, &duckduckgo, &yahoo_hk, &baidu, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_hk, &baidu, &bing,
- };
- 
- // Honduras
- const PrepopulatedEngine* const engines_HN[] = {
--    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Croatia
- const PrepopulatedEngine* const engines_HR[] = {
--    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Hungary
- const PrepopulatedEngine* const engines_HU[] = {
--    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Indonesia
- const PrepopulatedEngine* const engines_ID[] = {
--    &google, &duckduckgo, &yahoo_id, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_id, &bing,
- };
- 
- // Ireland
- const PrepopulatedEngine* const engines_IE[] = {
--    &google, &duckduckgo, &bing, &yahoo_uk,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_uk,
- };
- 
- // Israel
- const PrepopulatedEngine* const engines_IL[] = {
--    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // India
- const PrepopulatedEngine* const engines_IN[] = {
--    &google, &duckduckgo, &bing, &yahoo_in,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_in,
- };
- 
- // Iraq
- const PrepopulatedEngine* const engines_IQ[] = {
--    &google, &duckduckgo, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Iran
- const PrepopulatedEngine* const engines_IR[] = {
--    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Iceland
- const PrepopulatedEngine* const engines_IS[] = {
--    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Italy
- const PrepopulatedEngine* const engines_IT[] = {
--    &google, &duckduckgo, &virgilio, &bing,
-+    &google, &startpage, &duckduckgo, &virgilio, &bing,
- };
- 
- // Jamaica
- const PrepopulatedEngine* const engines_JM[] = {
--    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Jordan
- const PrepopulatedEngine* const engines_JO[] = {
--    &google, &duckduckgo, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Japan
- const PrepopulatedEngine* const engines_JP[] = {
--    &google, &duckduckgo, &yahoo_jp, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_jp, &bing,
- };
- 
- // Kenya
- const PrepopulatedEngine* const engines_KE[] = {
--    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Kuwait
- const PrepopulatedEngine* const engines_KW[] = {
--    &google, &duckduckgo, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // South Korea
- const PrepopulatedEngine* const engines_KR[] = {
--    &google, &duckduckgo, &naver, &daum,
-+    &google, &startpage, &duckduckgo, &naver, &daum,
- };
- 
- // Kazakhstan
- const PrepopulatedEngine* const engines_KZ[] = {
--    &google, &duckduckgo, &mail_ru, &yandex_kz,
-+    &google, &startpage, &duckduckgo, &mail_ru, &yandex_kz,
- };
- 
- // Lebanon
- const PrepopulatedEngine* const engines_LB[] = {
--    &google, &duckduckgo, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Liechtenstein
- const PrepopulatedEngine* const engines_LI[] = {
--    &google, &duckduckgo, &bing, &yahoo_de,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_de,
- };
- 
- // Lithuania
- const PrepopulatedEngine* const engines_LT[] = {
--    &google, &duckduckgo, &bing, &yandex_ru,
-+    &google, &startpage, &duckduckgo, &bing, &yandex_ru,
- };
- 
- // Luxembourg
- const PrepopulatedEngine* const engines_LU[] = {
--    &google, &duckduckgo, &bing, &yahoo_fr,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_fr,
- };
- 
- // Latvia
- const PrepopulatedEngine* const engines_LV[] = {
--    &google, &duckduckgo, &yandex_ru, &bing,
-+    &google, &startpage, &duckduckgo, &yandex_ru, &bing,
- };
- 
- // Libya
- const PrepopulatedEngine* const engines_LY[] = {
--    &google, &duckduckgo, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Morocco
- const PrepopulatedEngine* const engines_MA[] = {
--    &google, &duckduckgo, &bing, &yahoo_maktoob,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // Monaco
- const PrepopulatedEngine* const engines_MC[] = {
--    &google, &duckduckgo, &yahoo_fr, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_fr, &bing,
- };
- 
- // Moldova
- const PrepopulatedEngine* const engines_MD[] = {
--    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Montenegro
- const PrepopulatedEngine* const engines_ME[] = {
--    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Macedonia
- const PrepopulatedEngine* const engines_MK[] = {
--    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Mexico
- const PrepopulatedEngine* const engines_MX[] = {
--    &google, &duckduckgo, &bing, &yahoo_mx,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_mx,
- };
- 
- // Malaysia
- const PrepopulatedEngine* const engines_MY[] = {
--    &google, &duckduckgo, &yahoo_my, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_my, &bing,
- };
- 
- // Nicaragua
- const PrepopulatedEngine* const engines_NI[] = {
--    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Netherlands
- const PrepopulatedEngine* const engines_NL[] = {
--    &google, &duckduckgo, &yahoo_nl, &vinden,
-+    &google, &startpage, &duckduckgo, &yahoo_nl, &vinden,
- };
- 
- // Norway
- const PrepopulatedEngine* const engines_NO[] = {
--    &google, &duckduckgo, &bing, &kvasir,
-+    &google, &startpage, &duckduckgo, &bing, &kvasir,
- };
- 
- // New Zealand
- const PrepopulatedEngine* const engines_NZ[] = {
--    &google, &duckduckgo, &bing, &yahoo_nz,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_nz,
- };
- 
- // Oman
- const PrepopulatedEngine* const engines_OM[] = {
--    &google, &duckduckgo, &bing, &yahoo_maktoob,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // Panama
- const PrepopulatedEngine* const engines_PA[] = {
--    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Peru
- const PrepopulatedEngine* const engines_PE[] = {
--    &google, &duckduckgo, &bing, &yahoo_pe,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_pe,
- };
- 
- // Philippines
- const PrepopulatedEngine* const engines_PH[] = {
--    &google, &duckduckgo, &yahoo_ph, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_ph, &bing,
- };
- 
- // Pakistan
- const PrepopulatedEngine* const engines_PK[] = {
--    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Puerto Rico
- const PrepopulatedEngine* const engines_PR[] = {
--    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Poland
- const PrepopulatedEngine* const engines_PL[] = {
--    &google, &duckduckgo, &onet, &bing,
-+    &google, &startpage, &duckduckgo, &onet, &bing,
- };
- 
- // Portugal
- const PrepopulatedEngine* const engines_PT[] = {
--    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Paraguay
- const PrepopulatedEngine* const engines_PY[] = {
--    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Qatar
- const PrepopulatedEngine* const engines_QA[] = {
--    &google, &duckduckgo, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Romania
- const PrepopulatedEngine* const engines_RO[] = {
--    &google, &duckduckgo, &yahoo_ro, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_ro, &bing,
- };
- 
- // Serbia
- const PrepopulatedEngine* const engines_RS[] = {
--    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Russia
- const PrepopulatedEngine* const engines_RU[] = {
--    &google, &duckduckgo, &yandex_ru, &mail_ru,
-+    &google, &startpage, &duckduckgo, &yandex_ru, &mail_ru,
- };
- 
- // Rwanda
- const PrepopulatedEngine* const engines_RW[] = {
--    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Saudi Arabia
- const PrepopulatedEngine* const engines_SA[] = {
--    &google, &duckduckgo, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Sweden
- const PrepopulatedEngine* const engines_SE[] = {
--    &google, &duckduckgo, &bing, &yahoo_se,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_se,
- };
- 
- // Singapore
- const PrepopulatedEngine* const engines_SG[] = {
--    &google, &duckduckgo, &yahoo_sg, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_sg, &bing,
- };
- 
- // Slovenia
- const PrepopulatedEngine* const engines_SI[] = {
--    &google, &duckduckgo, &najdi, &ask,
-+    &google, &startpage, &duckduckgo, &najdi, &ask,
- };
- 
- // Slovakia
- const PrepopulatedEngine* const engines_SK[] = {
--    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // El Salvador
- const PrepopulatedEngine* const engines_SV[] = {
--    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Syria
- const PrepopulatedEngine* const engines_SY[] = {
--    &google, &duckduckgo, &bing, &yahoo_maktoob,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // Thailand
- const PrepopulatedEngine* const engines_TH[] = {
--    &google, &duckduckgo, &yahoo_th, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_th, &bing,
- };
- 
- // Tunisia
- const PrepopulatedEngine* const engines_TN[] = {
--    &google, &duckduckgo, &bing, &yahoo_maktoob,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // Turkey
- const PrepopulatedEngine* const engines_TR[] = {
--    &google, &duckduckgo, &bing, &yahoo_tr, &yandex_tr,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_tr, &yandex_tr,
- };
- 
- // Trinidad and Tobago
- const PrepopulatedEngine* const engines_TT[] = {
--    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Taiwan
- const PrepopulatedEngine* const engines_TW[] = {
--    &google, &duckduckgo, &yahoo_tw, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_tw, &bing,
- };
- 
- // Tanzania
- const PrepopulatedEngine* const engines_TZ[] = {
--    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Ukraine
- const PrepopulatedEngine* const engines_UA[] = {
--    &google, &duckduckgo, &yandex_ua, &bing,
-+    &google, &startpage, &duckduckgo, &yandex_ua, &bing,
- };
- 
- // United States
- const PrepopulatedEngine* const engines_US[] = {
--    &google, &duckduckgo, &bing, &yahoo, &aol, &ask,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo, &aol, &ask,
- };
- 
- // Uruguay
- const PrepopulatedEngine* const engines_UY[] = {
--    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Venezuela
- const PrepopulatedEngine* const engines_VE[] = {
--    &google, &duckduckgo, &bing, &yahoo_ve,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_ve,
- };
- 
- // Vietnam
- const PrepopulatedEngine* const engines_VN[] = {
--    &google, &duckduckgo, &yahoo_vn, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_vn, &bing,
- };
- 
- // Yemen
- const PrepopulatedEngine* const engines_YE[] = {
--    &google, &duckduckgo, &bing, &yahoo_maktoob,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // South Africa
- const PrepopulatedEngine* const engines_ZA[] = {
--    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Zimbabwe
- const PrepopulatedEngine* const engines_ZW[] = {
--    &google, &duckduckgo, &bing, &yahoo, &ask,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo, &ask,
- };
- 
- // A list of all the engines that we know about.
- const PrepopulatedEngine* const kAllEngines[] = {
-     // Prepopulated engines:
--    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &google, &duckduckgo, &kvasir,
-+    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &google, &startpage, &duckduckgo, &kvasir,
-     &mail_ru, &najdi, &naver, &onet, &seznam, &sogou, &vinden, &virgilio,
-     &yahoo, &yahoo_ar, &yahoo_at, &yahoo_au, &yahoo_br, &yahoo_ca, &yahoo_ch,
-     &yahoo_cl, &yahoo_co, &yahoo_de, &yahoo_dk, &yahoo_es, &yahoo_fi, &yahoo_fr,

patches/privacy/disable-amp-from-search-results.patch

@@ -1,66 +0,0 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Sat Oct 28 10:09:41 2017 +0200
-
-    Do not track google search results clicks
-    
-    Limit AMP cleanup to main search results
-
-diff --git a/third_party/WebKit/Source/core/dom/BUILD.gn b/third_party/WebKit/Source/core/dom/BUILD.gn
---- a/third_party/WebKit/Source/core/dom/BUILD.gn
-+++ b/third_party/WebKit/Source/core/dom/BUILD.gn
-@@ -344,6 +344,7 @@ blink_core_sources("dom") {
-     "events/TreeScopeEventContext.h",
-     "events/WindowEventContext.cpp",
-     "events/WindowEventContext.h",
-+    "extensions/dont-track-me.h",
-     "ng/flat_tree_traversal_ng.cc",
-     "ng/flat_tree_traversal_ng.h",
-     "trustedtypes/TrustedHTML.cpp",
-diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
---- a/third_party/WebKit/Source/core/dom/Document.cpp
-+++ b/third_party/WebKit/Source/core/dom/Document.cpp
-@@ -218,6 +218,7 @@
- #include "core/xml/parser/XMLDocumentParser.h"
- #include "core/xml_names.h"
- #include "core/xmlns_names.h"
-+#include "extensions/dont-track-me.h"
- #include "platform/CrossThreadFunctional.h"
- #include "platform/DateComponents.h"
- #include "platform/EventDispatchForbiddenScope.h"
-@@ -5826,8 +5827,24 @@ void Document::FinishedParsing() {
-     fetcher_->ClearResourcesFromPreviousFetcher();
-   }
- 
--  if (IsPrefetchOnly())
-+  if (IsPrefetchOnly()) {
-     WebPrerenderingSupport::Current()->PrefetchFinished();
-+    return;
-+  }
-+
-+  // determine whether this is a Google search results page
-+  const SecurityOrigin *origin = GetSecurityOrigin();
-+  if (origin) {
-+    WTF::String domain = origin->Domain();
-+    size_t pos = domain.Find(".google.");
-+    auto* bodyElement = body();
-+    if (bodyElement && (pos != WTF::kNotFound) && (domain.length() - pos - 8 < 4)) {
-+      LOG(INFO) << "injecting dont-track-me Javascript payload";
-+      HTMLScriptElement* e = HTMLScriptElement::Create(*this, false);
-+      e->setText(DONT_TRACK_ME_JS);
-+      bodyElement->AppendChild(e);
-+    }
-+  }
- }
- 
- void Document::ElementDataCacheClearTimerFired(TimerBase*) {
-diff --git a/third_party/WebKit/Source/core/dom/extensions/dont-track-me.h b/third_party/WebKit/Source/core/dom/extensions/dont-track-me.h
-new file mode 100644
---- /dev/null
-+++ b/third_party/WebKit/Source/core/dom/extensions/dont-track-me.h
-@@ -0,0 +1,6 @@
-+#ifndef dont_track_me_h
-+#define dont_track_me_h
-+
-+#define DONT_TRACK_ME_JS "// Bromite click-tracking and AMP removal\nfunction recreateHyperlink(a) {\n    // create new A element - old one has event listeners attached\n    var newA = document.createElement('a');\n    newA.referrerPolicy = 'origin';\n\n    // remove AMP class, get actual page URL\n    var ampCur = a.getAttribute('data-amp-cur');\n    if (ampCur) {\n        newA.href = ampCur;\n        a.classList.remove('amp_r');\n    } else {\n        var realLink = getRealLinkFromGoogleUrl(a);\n        if (realLink) {\n            newA.href = realLink;\n        } else {\n            // might not be an actual hyperlink, ignore it\n            if (!a.href) {\n                return;\n            }\n            newA.href = a.href;\n        }\n    }\n    // copy CSS classes\n    newA.className = a.className;\n\n    // copy nodes inside the hyperlink\n    while (a.firstChild) {\n        newA.appendChild(a.lastChild);\n    }\n    // replace hyperlink\n    a.parentNode.replaceChild(newA, a);\n}\n\n/**\n * @returns {String} the real URL if the given link is a Google redirect URL.\n */\nfunction getRealLinkFromGoogleUrl(a) {\n    if ((a.hostname === location.hostname || a.hostname === 'www.google.com') &&\n        /^\\/(local_)?url$/.test(a.pathname)) {\n        // Google Maps / Dito (/local_url?q=<url>)\n        // Mobile (/url?q=<url>)\n        var url = /[?&](?:q|url)=((?:https?|ftp)[%:][^&]+)/.exec(a.search);\n        if (url) {\n            return decodeURIComponent(url[1]);\n        }\n        // Help pages, e.g. safe browsing (/url?...&q=%2Fsupport%2Fanswer...)\n        url = /[?&](?:q|url)=((?:%2[Ff]|\\/)[^&]+)/.exec(a.search);\n        if (url) {\n            return a.origin + decodeURIComponent(url[1]);\n        }\n    }\n}\n\nfunction sanitizeAllHyperlinks() {\n    // scan all hyperlinks\n    var hyperlinks = document.getElementsByTagName('a');\n    for (var i = 0; i < hyperlinks.length; i++) {\n        recreateHyperlink(hyperlinks[i]);\n    }\n}\n\nif ((document.location.host.indexOf(\"images.google\") == -1) && (document.location.host.indexOf(\"news.google\") == -1))\n\tsanitizeAllHyperlinks();\n"
-+
-+#endif  // dont_track_me_h

patches/privacy/disable-battery-status-service.patch

@@ -1,29 +0,0 @@
-commit 8ca595ca27ab3d99674275c96b06b160a83d92e3
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Oct 11 22:57:29 2017 +0200
-
-    Disable battery status service
-
-diff --git a/services/device/battery/battery_status_service.cc b/services/device/battery/battery_status_service.cc
-index 988f20d..adbaf69 100644
---- a/services/device/battery/battery_status_service.cc
-+++ b/services/device/battery/battery_status_service.cc
-@@ -41,6 +41,7 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) {
-   if (!battery_fetcher_)
-     battery_fetcher_ = BatteryStatusManager::Create(update_callback_);
- 
-+#if 0
-   if (callback_list_.empty()) {
-     bool success = battery_fetcher_->StartListeningBatteryChange();
-     // On failure pass the default values back.
-@@ -52,6 +53,10 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) {
-     // Send recent status to the new callback if already available.
-     callback.Run(status_);
-   }
-+#else
-+  // Always pass the default values.
-+  callback.Run(BatteryStatus());
-+#endif
- 
-   return callback_list_.Add(callback);
- }

patches/privacy/disable-data-saver.patch

@@ -1,52 +0,0 @@
-commit 6a6024067d27a53fb58af282580da68f6cea8809
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Fri Oct 27 15:53:37 2017 +0200
-
-    Ported data reduction disable patch
-
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
-index ccc8517..5c69672 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
-@@ -144,7 +144,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
-         boolean notifyAdapter = false;
-         // An optional Data Saver page.
-         if (mFreProperties.getBoolean(SHOW_DATA_REDUCTION_PAGE)) {
--            mPages.add(pageOf(DataReductionProxyFirstRunFragment.class));
-+            //mPages.add(pageOf(DataReductionProxyFirstRunFragment.class));
-             mFreProgressStates.add(FRE_PROGRESS_DATA_SAVER_SHOWN);
-             notifyAdapter = true;
-         }
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java
-index 822f642..06e91a5 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java
-@@ -156,6 +156,7 @@ public class DataReductionProxySettings {
-         // DataReductionProxySettings is a singleton that lives forever and there's no clean
-         // shutdown of Chrome on Android
-         mNativeDataReductionProxySettings = nativeInit();
-+        nativeSetDataReductionProxyEnabled(mNativeDataReductionProxySettings, false);
-     }
- 
-     /** Returns true if the SPDY proxy promo is allowed to be shown. */
-@@ -178,6 +179,7 @@ public class DataReductionProxySettings {
-      * data reduction statistics if this is the first time the SPDY proxy has been enabled.
-      */
-     public void setDataReductionProxyEnabled(Context context, boolean enabled) {
-+        enabled = false;
-         if (enabled
-                 && ContextUtils.getAppSharedPreferences().getLong(
-                            DATA_REDUCTION_FIRST_ENABLED_TIME, 0)
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoUtils.java
-index bd42c89..b147765 100644
---- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoUtils.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoUtils.java
-@@ -68,7 +68,7 @@ public class DataReductionPromoUtils {
-         }
-         if (DataReductionProxySettings.getInstance().isDataReductionProxyManaged()) return false;
-         if (DataReductionProxySettings.getInstance().isDataReductionProxyEnabled()) return false;
--        return true;
-+        return false;
-     }
- 
-     /**

patches/privacy/disable-formatting-in-omnibox.patch

@@ -1,25 +0,0 @@
-commit 31f49917379c516f5c71f4ca5aa140e2184c9f3b
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Oct 11 23:24:58 2017 +0200
-
-    Disables omission of URL elements in Omnibox
-
-diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc
-index bad3a45a..066407e 100644
---- a/components/url_formatter/url_formatter.cc
-+++ b/components/url_formatter/url_formatter.cc
-@@ -401,10 +401,10 @@ bool 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 kFormatUrlOmitNothing = 1;
-+const FormatUrlType kFormatUrlOmitUsernamePassword = 0 << 0;
-+const FormatUrlType kFormatUrlOmitHTTP = 0 << 1;
-+const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 0 << 2;
- const FormatUrlType kFormatUrlOmitHTTPS = 1 << 3;
- const FormatUrlType kFormatUrlExperimentalElideAfterHost = 1 << 4;
- const FormatUrlType kFormatUrlExperimentalOmitTrivialSubdomains = 1 << 5;

patches/privacy/disable-gcm-status-check.patch

@@ -1,39 +0,0 @@
-commit fd5c89a560c1fcbab8cd9b7335aca75a2d22d1e5
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Oct 11 22:58:52 2017 +0200
-
-    Disable GCM status check
-
-diff --git a/components/gcm_driver/gcm_channel_status_request.cc b/components/gcm_driver/gcm_channel_status_request.cc
-index 8972447..415b1ab 100644
---- a/components/gcm_driver/gcm_channel_status_request.cc
-+++ b/components/gcm_driver/gcm_channel_status_request.cc
-@@ -23,8 +23,10 @@ namespace gcm {
- 
- namespace {
- 
-+#if 0
- const char kRequestContentType[] = "application/octet-stream";
- const char kGCMChannelTag[] = "gcm_channel";
-+#endif
- const int kDefaultPollIntervalSeconds = 60 * 60;  // 60 minutes.
- const int kMinPollIntervalSeconds = 30 * 60;  // 30 minutes.
- 
-@@ -57,6 +59,7 @@ int GCMChannelStatusRequest::min_poll_interval_seconds() {
- }
- 
- void GCMChannelStatusRequest::Start() {
-+#if 0
-   DCHECK(!url_fetcher_.get());
- 
-   GURL request_url(channel_status_request_url_);
-@@ -112,6 +115,9 @@ void GCMChannelStatusRequest::Start() {
-   url_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
-                              net::LOAD_DO_NOT_SAVE_COOKIES);
-   url_fetcher_->Start();
-+#endif
-+  // Simulate an empty response and disable GCM.
-+  callback_.Run(false, false, 0);
- }
- 
- void GCMChannelStatusRequest::OnURLFetchComplete(

patches/privacy/disable-google-fonts-3rd-party.patch

@@ -1,13 +0,0 @@
-diff --git a/tracing/third_party/gl-matrix/jsdoc-template/static/default.css b/tracing/third_party/gl-matrix/jsdoc-template/static/default.css
-index efcf782..99a6767 100644
---- a/third_party/catapult/tracing/third_party/gl-matrix/jsdoc-template/static/default.css
-+++ b/third_party/catapult/tracing/third_party/gl-matrix/jsdoc-template/static/default.css
-@@ -168,7 +168,7 @@ ul.inheritsList
- 
- /* Copied from styles.css generated by Github Pages */
- 
--@import url(https://fonts.googleapis.com/css?family=Lato:300italic,700italic,300,700);
-+@import url(chrome://resources/css/roboto.css);
- 
- body {
-   padding:50px;

patches/privacy/disable-google-fonts.patch

@@ -1,59 +0,0 @@
-commit a06e62ec32a189b8cd16266e47b386ebe00cc04c
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Thu Oct 12 07:41:20 2017 +0200
-
-    Disables references to fonts.googleapis.com
-
-diff --git a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
-index bed7d31..cb8971f 100644
---- 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::ShouldServiceRequest(
- 
- std::string DomDistillerViewerSource::GetContentSecurityPolicyStyleSrc()
-     const {
--  return "style-src 'self' https://fonts.googleapis.com;";
-+  return "style-src 'self';";
- }
- 
- std::string DomDistillerViewerSource::GetContentSecurityPolicyChildSrc() const {
-diff --git a/components/dom_distiller/core/html/preview.html b/components/dom_distiller/core/html/preview.html
-index a4c07c5..894eb7f 100644
---- 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.
-   <meta name="theme-color" id="theme-color">
-   <title>Title goes here and it could be kind of lengthy - Publisher name</title>
-   <link href="../css/distilledpage.css" rel="stylesheet" type="text/css">
--  <link href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
-+  <link href='chrome://resources/css/roboto.css' rel='stylesheet' type='text/css'>
-   <style>
-     .english :lang(th) {display: none}
-     .english :lang(zh) {display: none}
-diff --git a/components/dom_distiller/core/javascript/dom_distiller_viewer.js b/components/dom_distiller/core/javascript/dom_distiller_viewer.js
-index 61ef521..2640e3a 100644
---- a/components/dom_distiller/core/javascript/dom_distiller_viewer.js
-+++ b/components/dom_distiller/core/javascript/dom_distiller_viewer.js
-@@ -120,7 +120,7 @@ function maybeSetWebFont() {
-   if (distiller_on_ios) return;
- 
-   var e = document.createElement('link');
--  e.href = 'https://fonts.googleapis.com/css?family=Roboto';
-+  e.href = 'chrome://resources/css/roboto.css';
-   e.rel = 'stylesheet';
-   e.type = 'text/css';
-   document.head.appendChild(e);
-diff --git a/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css b/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css
-index f21cfe9..b7a5d7a 100644
---- a/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css
-+++ b/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css
-@@ -12,8 +12,7 @@
-  * See the License for the specific language governing permissions and
-  * limitations under the License. */
- 
--@import "https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&subset=latin,cyrillic-ext,greek-ext,cyrillic,greek,vietnamese,latin-ext";
--@import "https://fonts.googleapis.com/css?family=Source+Code+Pro";
-+@import "chrome://resources/css/roboto.css";
- 
- body,
- table,

patches/privacy/disable-ntp-remote-suggestions.patch

@@ -1,30 +0,0 @@
-commit e1675be76a5ab56335b878dcef50043159efae7a
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Thu Oct 12 08:15:17 2017 +0200
-
-    Disable NTP remote suggestions by default
-
-diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/features.cc
-index 31823bbc..82eefe3 100644
---- a/components/ntp_snippets/features.cc
-+++ b/components/ntp_snippets/features.cc
-@@ -38,16 +38,16 @@ const base::Feature* const kAllFeatures[] = {
-     nullptr};
- 
- const base::Feature kArticleSuggestionsFeature{
--    "NTPArticleSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
-+    "NTPArticleSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
- 
- const base::Feature kBookmarkSuggestionsFeature{
--    "NTPBookmarkSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
-+    "NTPBookmarkSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
- 
- const base::Feature kRecentOfflineTabSuggestionsFeature{
-     "NTPOfflinePageSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
- 
- const base::Feature kIncreasedVisibility{"NTPSnippetsIncreasedVisibility",
--                                         base::FEATURE_ENABLED_BY_DEFAULT};
-+                                         base::FEATURE_DISABLED_BY_DEFAULT};
- 
- const base::Feature kPhysicalWebPageSuggestionsFeature{
-     "NTPPhysicalWebPageSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};

patches/privacy/disable-updater-pings.patch

@@ -1,66 +0,0 @@
-commit 835aa728bc2eaa7f01dc875d87aa64b61bb11ccd
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Thu Oct 12 01:35:53 2017 +0200
-
-    Disable updater pings
-
-diff --git a/components/component_updater/configurator_impl.cc b/components/component_updater/configurator_impl.cc
-index efc46c5..2bb49f36 100644
---- a/components/component_updater/configurator_impl.cc
-+++ b/components/component_updater/configurator_impl.cc
-@@ -56,8 +56,10 @@ const char kSwitchDisableDeltaUpdates[] = "disable-delta-updates";
- const char kSwitchDisableBackgroundDownloads[] = "disable-background-downloads";
- #endif  // defined(OS_WIN)
- 
-+#if 0
- const base::Feature kAlternateComponentUrls{"AlternateComponentUrls",
-                                             base::FEATURE_ENABLED_BY_DEFAULT};
-+#endif
- 
- // If there is an element of |vec| of the form |test|=.*, returns the right-
- // hand side of that assignment. Otherwise, returns an empty string.
-@@ -89,8 +91,7 @@ ConfiguratorImpl::ConfiguratorImpl(
-       fast_update_(false),
-       pings_enabled_(false),
-       deltas_enabled_(false),
--      background_downloads_enabled_(false),
--      require_encryption_(require_encryption) {
-+      background_downloads_enabled_(false) {
-   // Parse comma-delimited debug flags.
-   std::vector<std::string> switch_values = base::SplitString(
-       cmdline->GetSwitchValueASCII(switches::kComponentUpdater), ",",
-@@ -138,22 +139,6 @@ int ConfiguratorImpl::UpdateDelay() const {
- 
- std::vector<GURL> ConfiguratorImpl::UpdateUrl() const {
-   std::vector<GURL> urls;
--  if (url_source_override_.is_valid()) {
--    urls.push_back(GURL(url_source_override_));
--    return urls;
--  }
--
--  if (base::FeatureList::IsEnabled(kAlternateComponentUrls)) {
--    urls.push_back(GURL(kUpdaterDefaultUrlAlt));
--    urls.push_back(GURL(kUpdaterFallbackUrlAlt));
--  } else {
--    urls.push_back(GURL(kUpdaterDefaultUrl));
--    urls.push_back(GURL(kUpdaterFallbackUrl));
--  }
--
--  if (require_encryption_)
--    update_client::RemoveUnsecureUrls(&urls);
--
-   return urls;
- }
- 
-diff --git a/components/component_updater/configurator_impl.h b/components/component_updater/configurator_impl.h
-index afc3d2d..5258e47 100644
---- a/components/component_updater/configurator_impl.h
-+++ b/components/component_updater/configurator_impl.h
-@@ -98,7 +98,6 @@ class ConfiguratorImpl {
-   bool pings_enabled_;
-   bool deltas_enabled_;
-   bool background_downloads_enabled_;
--  bool require_encryption_;
- 
-   DISALLOW_COPY_AND_ASSIGN(ConfiguratorImpl);
- };

patches/privacy/disable-webrtc.patch

@@ -1,24 +0,0 @@
-commit aff93733a4c414f9182103b7384c23e6fa450a6a
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Thu Oct 26 16:59:03 2017 +0200
-
-    Disable WebRTC by default
-
-diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
-index 946f7cd..96b79b1 100644
---- a/chrome/browser/ui/browser_ui_prefs.cc
-+++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -81,10 +81,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
- #endif
- #if BUILDFLAG(ENABLE_WEBRTC)
-   // TODO(guoweis): Remove next 2 options at M50.
--  registry->RegisterBooleanPref(prefs::kWebRTCMultipleRoutesEnabled, true);
--  registry->RegisterBooleanPref(prefs::kWebRTCNonProxiedUdpEnabled, true);
-+  registry->RegisterBooleanPref(prefs::kWebRTCMultipleRoutesEnabled, false);
-+  registry->RegisterBooleanPref(prefs::kWebRTCNonProxiedUdpEnabled, false);
-   registry->RegisterStringPref(prefs::kWebRTCIPHandlingPolicy,
--                               content::kWebRTCIPHandlingDefault);
-+                               content::kWebRTCIPHandlingDisableNonProxiedUdp);
-   registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string());
- #endif
- 

patches/privacy/modify-default-prefs.patch

@@ -1,238 +0,0 @@
-commit 3075d5cc23f69b42c80690162426ae2501cd2b5b
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Thu Oct 12 08:09:24 2017 +0200
-
-    Modify default preferences
-
-diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc
-index 6b66f9e..ac44881 100644
---- a/chrome/browser/background/background_mode_manager.cc
-+++ b/chrome/browser/background/background_mode_manager.cc
-@@ -363,7 +363,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
-   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) {
-diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
-index a96f159e..7f7e9cf 100644
---- a/chrome/browser/chrome_content_browser_client.cc
-+++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -877,7 +877,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
- 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);
- }
- 
-diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
-index e6ccce4..1e37c2b 100644
---- a/chrome/browser/io_thread.cc
-+++ b/chrome/browser/io_thread.cc
-@@ -612,7 +612,7 @@ void IOThread::RegisterPrefs(PrefRegistrySimple* registry) {
-                                std::string());
-   registry->RegisterBooleanPref(prefs::kEnableReferrers, true);
-   data_reduction_proxy::RegisterPrefs(registry);
--  registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, true);
-+  registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, false);
-   registry->RegisterBooleanPref(prefs::kQuickCheckEnabled, true);
-   registry->RegisterBooleanPref(prefs::kPacHttpsUrlStrippingEnabled, true);
- #if defined(OS_POSIX)
-diff --git a/chrome/browser/net/prediction_options.cc b/chrome/browser/net/prediction_options.cc
-index 8ab8a07..967bf2f 100644
---- a/chrome/browser/net/prediction_options.cc
-+++ b/chrome/browser/net/prediction_options.cc
-@@ -30,7 +30,7 @@ NetworkPredictionStatus CanPrefetchAndPrerender(
-         return NetworkPredictionStatus::ENABLED;
-       }
-     default:
--      DCHECK_EQ(NETWORK_PREDICTION_NEVER, network_prediction_options);
-+      //DCHECK_EQ(NETWORK_PREDICTION_NEVER, network_prediction_options);
-       return NetworkPredictionStatus::DISABLED_ALWAYS;
-   }
- }
-diff --git a/chrome/browser/net/prediction_options.h b/chrome/browser/net/prediction_options.h
-index 6512483..4c55a19 100644
---- 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 {
-diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
-index 52042ee..b1acb4a 100644
---- a/chrome/browser/profiles/profile.cc
-+++ b/chrome/browser/profiles/profile.cc
-@@ -136,7 +136,7 @@ const char Profile::kNoHostedDomainFound[] = "NO_HOSTED_DOMAIN";
- void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
-   registry->RegisterBooleanPref(
-       prefs::kSearchSuggestEnabled,
--      true,
-+      false,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
- #if defined(OS_ANDROID)
-   registry->RegisterStringPref(
-diff --git a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html b/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
-index b46a992..9d353d9 100644
---- a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
-+++ b/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
-@@ -45,7 +45,7 @@
-         </paper-button>
-       </div>
-       <div slot="footer">
--        <paper-checkbox id="sendSettings" checked>
-+        <paper-checkbox id="sendSettings">
-           $i18nRaw{resetPageFeedback}</paper-checkbox>
-       </div>
-     </dialog>
-diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc
-index 0f4bdb3..77e4810 100644
---- a/chrome/browser/signin/signin_promo.cc
-+++ b/chrome/browser/signin/signin_promo.cc
-@@ -371,8 +371,8 @@ void ForceWebBasedSigninFlowForTesting(bool force) {
- void RegisterProfilePrefs(
-     user_prefs::PrefRegistrySyncable* registry) {
-   registry->RegisterIntegerPref(prefs::kSignInPromoStartupCount, 0);
--  registry->RegisterBooleanPref(prefs::kSignInPromoUserSkipped, false);
--  registry->RegisterBooleanPref(prefs::kSignInPromoShowOnFirstRunAllowed, true);
-+  registry->RegisterBooleanPref(prefs::kSignInPromoUserSkipped, true);
-+  registry->RegisterBooleanPref(prefs::kSignInPromoShowOnFirstRunAllowed, false);
-   registry->RegisterBooleanPref(prefs::kSignInPromoShowNTPBubble, false);
- }
- 
-diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
-index bcd4d0e..2302f0f 100644
---- a/chrome/browser/ui/browser_ui_prefs.cc
-+++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -59,11 +59,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
-   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->RegisterBooleanPref(prefs::kDevToolsDisabled, false);
-   registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacement);
-   registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacementPopup);
-diff --git a/chrome/browser/ui/navigation_correction_tab_observer.cc b/chrome/browser/ui/navigation_correction_tab_observer.cc
-index 887d681..60eea93 100644
---- a/chrome/browser/ui/navigation_correction_tab_observer.cc
-+++ b/chrome/browser/ui/navigation_correction_tab_observer.cc
-@@ -58,7 +58,7 @@ NavigationCorrectionTabObserver::~NavigationCorrectionTabObserver() {
- void NavigationCorrectionTabObserver::RegisterProfilePrefs(
-     user_prefs::PrefRegistrySyncable* prefs) {
-   prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled,
--                             true,
-+                             false,
-                              user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
- }
- 
-diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
-index 8d043bd..69aa9f4 100644
---- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
-+++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
-@@ -143,10 +143,6 @@ void LocalDiscoveryUI::RegisterProfilePrefs(
-     user_prefs::PrefRegistrySyncable* registry) {
-   registry->RegisterBooleanPref(
-       prefs::kLocalDiscoveryNotificationsEnabled,
--#if defined(OS_WIN)
-       false,
--#else
--      true,
--#endif
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
- }
-diff --git a/chrome/service/cloud_print/connector_settings.cc b/chrome/service/cloud_print/connector_settings.cc
-index 83a4617..4b8511c 100644
---- a/chrome/service/cloud_print/connector_settings.cc
-+++ b/chrome/service/cloud_print/connector_settings.cc
-@@ -60,7 +60,7 @@ void ConnectorSettings::InitFrom(ServiceProcessPrefs* prefs) {
-   DCHECK(server_url_.is_valid());
- 
-   connect_new_printers_ = prefs->GetBoolean(
--      prefs::kCloudPrintConnectNewPrinters, true);
-+      prefs::kCloudPrintConnectNewPrinters, false);
- 
-   xmpp_ping_enabled_ = prefs->GetBoolean(
-       prefs::kCloudPrintXmppPingEnabled, false);
-diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
-index 9468cf2..86366ca 100644
---- a/components/autofill/core/browser/autofill_manager.cc
-+++ b/components/autofill/core/browser/autofill_manager.cc
-@@ -211,7 +211,7 @@ void AutofillManager::RegisterProfilePrefs(
-   registry->RegisterIntegerPref(
-       prefs::kAutofillCreditCardSigninPromoImpressionCount, 0);
-   registry->RegisterBooleanPref(
--      prefs::kAutofillEnabled, true,
-+      prefs::kAutofillEnabled, false,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-   registry->RegisterBooleanPref(
-       prefs::kAutofillProfileUseDatesFixed, false,
-diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmarks/browser/bookmark_utils.cc
-index 8455e49..c7e70c0 100644
---- a/components/bookmarks/browser/bookmark_utils.cc
-+++ b/components/bookmarks/browser/bookmark_utils.cc
-@@ -442,12 +442,12 @@ void GetBookmarksMatchingProperties(BookmarkModel* model,
- 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,
-diff --git a/components/safe_browsing/common/safe_browsing_prefs.cc b/components/safe_browsing/common/safe_browsing_prefs.cc
-index a05123f..4b8b05cb 100644
---- a/components/safe_browsing/common/safe_browsing_prefs.cc
-+++ b/components/safe_browsing/common/safe_browsing_prefs.cc
-@@ -343,9 +343,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
-   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);
-diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
-index b8da726..b9ca9b0 100644
---- a/extensions/common/extension.cc
-+++ b/extensions/common/extension.cc
-@@ -344,14 +344,6 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
-   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

patches/privacy/no-3rd-party-cookies.patch

@@ -1,20 +0,0 @@
-commit 0a3880671af60180c72cdaf18e24f699db87ae23
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Oct 11 22:50:10 2017 +0200
-
-    Disable third-party cookies by default
-    author: Chad Miller <chad.miller@canonical.com>
-
-diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc
-index 6dbac81..26a9c23 100644
---- a/components/content_settings/core/browser/cookie_settings.cc
-+++ b/components/content_settings/core/browser/cookie_settings.cc
-@@ -80,7 +80,7 @@ void CookieSettings::GetCookieSettings(
- void CookieSettings::RegisterProfilePrefs(
-     user_prefs::PrefRegistrySyncable* registry) {
-   registry->RegisterBooleanPref(
--      prefs::kBlockThirdPartyCookies, false,
-+      prefs::kBlockThirdPartyCookies, true,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
- }
- 

patches/privacy/no-promo.patch

@@ -1,21 +0,0 @@
-commit 0e91bb1894cc0b7a9f2ddb8d3a8dd0cdc609910a
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Oct 11 22:47:49 2017 +0200
-
-    Disable the ad promo system by default
-    author: Michael Gilbert <mgilbert@debian.org>
-    bug-debian: http://bugs.debian.org/634101
-
-diff --git a/chrome/browser/ui/app_list/app_list_service.cc b/chrome/browser/ui/app_list/app_list_service.cc
-index ce4b76e..23bedeb 100644
---- a/chrome/browser/ui/app_list/app_list_service.cc
-+++ b/chrome/browser/ui/app_list/app_list_service.cc
-@@ -145,7 +145,7 @@ void AppListService::RegisterPrefs(PrefRegistrySimple* registry) {
- 
-   // Identifies whether we should show the app launcher promo or not. This
-   // becomes false when the user dismisses the promo.
--  registry->RegisterBooleanPref(prefs::kShowAppLauncherPromo, true);
-+  registry->RegisterBooleanPref(prefs::kShowAppLauncherPromo, false);
- }
- 
- // static

patches/privacy/prefs-do-not-store-passwords-by-default.patch

@@ -1,23 +0,0 @@
-commit 5927635bd17374da897e3d49264c536c68a09868
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Oct 11 23:17:17 2017 +0200
-
-    Do not store passwords by default
-
-diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc
-index bbb0c20..cf171c0 100644
---- a/components/password_manager/core/browser/password_manager.cc
-+++ b/components/password_manager/core/browser/password_manager.cc
-@@ -207,10 +207,10 @@ PasswordFormManager* FindMatchedManager(
- 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->RegisterBooleanPref(prefs::kWasObsoleteHttpDataCleaned, false);
-   registry->RegisterStringPref(prefs::kSyncPasswordHash, std::string(),

patches/privacy/prefs-only-keep-cookies-until-exit.patch

@@ -1,23 +0,0 @@
-commit 099b041051cd3ea166c38269aa584bee7962d816
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Oct 11 23:19:25 2017 +0200
-
-    Subject: [PATCH 21/60] prefs: only keep cookies until exit
-    From: Jan Engelhardt <jengelh@inai.de>
-    Date: Sat, 13 Sep 2014 17:25:47 +0200
-    
-    Out with all those tracking cookies!
-
-diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
-index fe84151..f303447 100644
---- a/components/content_settings/core/browser/content_settings_registry.cc
-+++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -118,7 +118,7 @@ void ContentSettingsRegistry::Init() {
-   // WARNING: The string names of the permissions passed in below are used to
-   // generate preference names and should never be changed!
- 
--  Register(CONTENT_SETTINGS_TYPE_COOKIES, "cookies", CONTENT_SETTING_ALLOW,
-+  Register(CONTENT_SETTINGS_TYPE_COOKIES, "cookies", CONTENT_SETTING_SESSION_ONLY,
-            WebsiteSettingsInfo::SYNCABLE,
-            WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme),
-            ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,

patches/privacy/promo-disable-Google-promotion-fetching.patch

@@ -1,34 +0,0 @@
-commit 232645939b9739109cfadd92755375dd775b4768
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Oct 11 23:22:05 2017 +0200
-
-    [PATCH 45/60] promo: disable Google promotion fetching
-    From: Jan Engelhardt <jengelh@inai.de>
-    Date: Sun, 9 Nov 2014 01:54:27 +0100
-    
-    Documentation is scarce, and sprinkled with misleading acronyms.
-    NTP is not NTP, for example. FWIW:
-    
-    // A PromoResourceService fetches data from a web resource server to
-    // be used to dynamically change the appearance of the New Tab Page.
-    // For example, it has been used to fetch "tips" to be displayed on
-    // the NTP, or to display promotional messages to certain groups of
-    // Chrome users.
-    
-    Whatever it is that it downloads, deactivate the one that leads to
-    Google.
-    
-    References: https://github.com/iridium-browser/iridium-browser/issues/33
-
-diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc
-index 4dd2f65..01f0f66 100644
---- a/chrome/browser/signin/signin_promo.cc
-+++ b/chrome/browser/signin/signin_promo.cc
-@@ -84,6 +84,7 @@ namespace signin {
- 
- bool ShouldShowPromoAtStartup(Profile* profile, bool is_new_profile) {
-   DCHECK(profile);
-+  return false;
- 
-   // Don't show if the profile is an incognito.
-   if (profile->IsOffTheRecord())

patches/privacy/restore-classic-ntp.patch

@@ -1,20 +0,0 @@
-commit a53d9cf12fb835938c2d2ad641633126a07bf636
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Sun Nov 26 11:40:05 2017 +0100
-
-    Restore classic new tab page
-
-diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
-index b756cb0..5785c581 100644
---- a/chrome/browser/search/search.cc
-+++ b/chrome/browser/search/search.cc
-@@ -171,9 +171,6 @@ struct NewTabURLDetails {
- 
-     NewTabURLState state = IsValidNewTabURL(profile, search_provider_url);
-     switch (state) {
--      case NEW_TAB_URL_VALID:
--        // We can use the search provider's page.
--        return NewTabURLDetails(search_provider_url, state);
-       case NEW_TAB_URL_INCOGNITO:
-         // Incognito has its own New Tab.
-         return NewTabURLDetails(GURL(), state);

patches/security/remove-ev-certificates.patch

@@ -1,45 +0,0 @@
-commit 6eaea225c3e5ceaba5a2753248c770b218bdc4f4
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Oct 11 23:12:18 2017 +0200
-
-    [PATCH 35/60] Remove EV certificates
-    From: Jan Engelhardt <jengelh@inai.de>
-    Date: Thu, 2 Apr 2015 12:44:23 +0200
-    
-    The team chose to let EV certificates appear just like normal
-    certificates. The web of trust is considered a failure in itself, so
-    do not give users a false sense of extra security with EV certs.
-    Instead, let them appear just like regular ones.
-
-diff --git a/net/cert/ev_root_ca_metadata.cc b/net/cert/ev_root_ca_metadata.cc
-index 3e89bb3..9bb411b 100644
---- a/net/cert/ev_root_ca_metadata.cc
-+++ b/net/cert/ev_root_ca_metadata.cc
-@@ -46,6 +46,16 @@ struct EVMetadata {
- 
- // These certificates may be found in net/data/ssl/ev_roots.
- static const EVMetadata ev_root_ca_metadata[] = {
-+  // need some dummy thing to make compiler happy, because
-+  // arraysize() is implemented as a convoluted template rather than
-+  // the traditional sizeof(x)/sizeof(*x)
-+  { { { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff } },
-+    {
-+      "0",
-+    }
-+  },
-+#if 0
-     // AC Camerfirma S.A. Chambers of Commerce Root - 2008
-     // https://www.camerfirma.com
-     {
-@@ -708,7 +718,9 @@ static const EVMetadata ev_root_ca_metadata[] = {
-           0xd2, 0x09, 0xb7, 0x37, 0xcb, 0xe2, 0xc1, 0x8c, 0xfb, 0x2c, 0x10,
-           0xc0, 0xff, 0x0b, 0xcf, 0x0d, 0x32, 0x86, 0xfc, 0x1a, 0xa2}},
-         {"2.16.840.1.114404.1.1.2.4.1", ""},
--    }};
-+    }
-+#endif
-+};
- 
- #endif  // defined(USE_NSS_CERTS) || defined(OS_IOS) || defined(OS_WIN)
-