Add top-level src/chrome_cleaner directory.

Rename swreporter watchlist to chrome_cleaner and add all chrome_cleaner
related files and directories to it.

Update other chrome_cleaner related OWNERS files to inherit from the new
top-level directory. Add a README.md to components/chrome_cleaner to
explain its relationship to the new directory.

Bug: 802092
Change-Id: Iadd38f0e7e818c78c356f5ac4d14911cec191a77
Reviewed-on: https://chromium-review.googlesource.com/901724
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Chris Sharp <csharp@chromium.org>
Commit-Queue: Joe Mason <joenotcharles@chromium.org>
Cr-Commit-Position: refs/heads/master@{#537028}

WATCHLISTS

@@ -630,6 +630,15 @@
                   '|net/cert/signed_tree_head'\
                   '|net/test/ct_',
     },
+    'chrome_cleaner': {
+      'filepath': 'chrome/browser/component_updater/sw_reporter_'\
+                  '|chrome/browser/resources/settings/chrome_cleanup_page/'\
+                  '|chrome/browser/safe_browsing/chrome_cleaner/'\
+                  '|chrome/browser/ui/views/chrome_cleaner_'\
+                  '|chrome/browser/ui/webui/settings/chrome_cleanup_'\
+                  '|chrome_cleaner/'\
+                  '|components/chrome_cleaner/',
+    },
     'chrome_elf': {
       'filepath': 'chrome_elf',
     },
@@ -1381,10 +1390,6 @@
                   '|chrome/browser/.*managed_user'\
                   '|chrome/browser/.*supervised_user',
     },
-    'swreporter': {
-      'filepath': 'chrome/browser/safe_browsing/chrome_cleaner/'\
-                  '|chrome/browser/component_updater/sw_reporter_',
-    },
     'sync': {
       'filepath': '^chrome/android/sync_shell/'\
                   '|^chrome/browser/ui/sync/'\
@@ -1902,6 +1907,9 @@
                                  'eranm@chromium.org',
                                  'martijn+crwatch@martijnc.be',
                                  'rsleevi+watch@chromium.org'],
+    'chrome_cleaner': ['csharp+watch@chromium.org',
+                       'ftirelo+watch@chromium.org',
+                       'joenotcharles+watch@chromium.org'],
     'chrome_elf': ['caitkp+watch@chromium.org',
                    'pennymac+watch@chromium.org'],
     'chrome_grc': ['chrome-grc-reviews@chromium.org'],
@@ -2225,9 +2233,6 @@
                    'vmpstr+watch@chromium.org'],
     'subresource_filter': ['subresource-filter-reviews@chromium.org'],
     'supervised_users': ['pam+watch@chromium.org'],
-    'swreporter': ['csharp+watch@chromium.org',
-                   'ftirelo+watch@chromium.org',
-                   'joenotcharles+watch@chromium.org'],
     'sync': ['sync-reviews@chromium.org'],
     'syncfs': ['kinuko+fileapi@chromium.org',
                'nhiroki@chromium.org',

chrome/browser/safe_browsing/chrome_cleaner/OWNERS

@@ -1,6 +1,4 @@
-csharp@chromium.org
-joenotcharles@chromium.org
-proberge@chromium.org
-robertshield@chromium.org
+file://chrome_cleaner/OWNERS
 
+# TEAM: security-dev@chromium.org
 # COMPONENT: UI>Browser>Preferences>Protector

chrome_cleaner/OWNERS

@@ -0,0 +1,7 @@
+csharp@chromium.org
+joenotcharles@chromium.org
+proberge@chromium.org
+robertshield@chromium.org
+
+# TEAM: security-dev@chromium.org
+# COMPONENT: UI>Browser>Preferences>Protector

chrome_cleaner/README.md

@@ -0,0 +1,46 @@
+# Chrome Cleanup Tool
+
+This directory contains the source code for the Chrome Cleanup Tool, a
+standalone application distributed to Chrome users to find and remove Unwanted
+Software (UwS).
+
+## Integration with Chrome
+
+The application is distributed in two versions:
+
+1.  A Chrome component named the Software Reporter that finds UwS but does not
+    have the ability to delete anything.
+2.  A separate download named Chrome Cleanup Tool that both finds and removes UwS.
+
+The Software Reporter runs in the background and, if it finds UwS that can be
+removed, reports this to Chrome. Chrome then downloads the full Cleanup Tool
+and shows a prompt on the settings page asking the user for permission to
+remove the UwS.
+
+This directory contains the source for both.
+
+Code in Chromium that deals with the Software Reporter Tool and Chrome Cleanup
+Tool includes:
+
+*   [Software Reporter component updater](/chrome/browser/component_updater)
+    (files `sw_reporter_installer_win*`)
+*   [Chrome Cleanup Tool fetcher and launcher](/chrome/browser/safe_browsing/chrome_cleaner)
+*   [Settings page resources](/chrome/browser/resources/settings/chrome_cleanup_page)
+*   [Settings page user interaction handlers](/chrome/browser/ui/webui/settings)
+    (files `chrome_cleanup_handler.*`)
+*   [UI for modal dialogs](/chrome/browser/ui/views) (files `chrome_cleaner_*`)
+*   [Shared constants and Mojo interfaces](/components/chrome_cleaner/public) -
+    These are used for communication between Chrome and the Software Reporter /
+    Chrome Cleanup Tool, so both this directory and the other Chromium
+    directories above have dependencies on them.
+
+## Status
+
+Incomplete: the source code for the Software Reporter and Chrome Cleanup Tool
+are currently being moved from a Google internal repository into this
+directory.
+
+## Contact
+
+csharp@chromium.org
+joenotcharles@chromium.org

components/chrome_cleaner/OWNERS

@@ -1,7 +1,4 @@
-csharp@chromium.org
-joenotcharles@chromium.org
-proberge@chromium.org
-robertshield@chromium.org
+file://chrome_cleaner/OWNERS
 
 # TEAM: security-dev@chromium.org
 # COMPONENT: UI>Browser>Preferences>Protector

components/chrome_cleaner/README.md

@@ -0,0 +1,5 @@
+This directory contains shared constants and interfaces used for communication
+between the [Chrome Cleanup Tool](/chrome_cleaner) and [Chrome's Safe Browsing
+service](/chrome/browser/safe_browsing/chrome_cleaner).
+
+