Move src/chrome_cleaner to src/chrome/chrome_cleaner

Bug: 834343
Change-Id: I8da77e5ca6d253a3ba10e284911848d8a0952ce2
Reviewed-on: https://chromium-review.googlesource.com/1018142
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Commit-Queue: Joe Mason <joenotcharles@chromium.org>
Cr-Commit-Position: refs/heads/master@{#552011}

WATCHLISTS

@@ -639,7 +639,7 @@
                   '|chrome/browser/safe_browsing/chrome_cleaner/'\
                   '|chrome/browser/ui/views/chrome_cleaner_'\
                   '|chrome/browser/ui/webui/settings/chrome_cleanup_'\
-                  '|chrome_cleaner/'\
+                  '|chrome/chrome_cleaner/'\
                   '|components/chrome_cleaner/',
     },
     'chrome_elf': {

chrome/browser/safe_browsing/chrome_cleaner/OWNERS

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

chrome/chrome_cleaner/cleaner/BUILD.gn

@@ -11,7 +11,7 @@ source_set("cleaner_headers") {
 
   public_deps = [
     "//base",
-    "//chrome_cleaner/constants:uws_id",
+    "//chrome/chrome_cleaner/constants:uws_id",
     "//components/chrome_cleaner/public/constants:constants",
   ]
 }

chrome/chrome_cleaner/cleaner/cleaner.h

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_CLEANER_CLEANER_CLEANER_H_
-#define CHROME_CLEANER_CLEANER_CLEANER_H_
+#ifndef CHROME_CHROME_CLEANER_CLEANER_CLEANER_H_
+#define CHROME_CHROME_CLEANER_CLEANER_CLEANER_H_
 
 #include <vector>
 
 #include "base/callback.h"
-#include "chrome_cleaner/constants/uws_id.h"
+#include "chrome/chrome_cleaner/constants/uws_id.h"
 #include "components/chrome_cleaner/public/constants/result_codes.h"
 
 namespace chrome_cleaner {
@@ -45,4 +45,4 @@ class Cleaner {
 
 }  // namespace chrome_cleaner
 
-#endif  // CHROME_CLEANER_CLEANER_CLEANER_H_
+#endif  // CHROME_CHROME_CLEANER_CLEANER_CLEANER_H_

chrome/chrome_cleaner/cleaner/noop_cleaner_impl.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome_cleaner/cleaner/noop_cleaner_impl.h"
+#include "chrome/chrome_cleaner/cleaner/noop_cleaner_impl.h"
 
 #include <utility>
 

chrome/chrome_cleaner/cleaner/noop_cleaner_impl.h

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_CLEANER_CLEANER_NOOP_CLEANER_IMPL_H_
-#define CHROME_CLEANER_CLEANER_NOOP_CLEANER_IMPL_H_
+#ifndef CHROME_CHROME_CLEANER_CLEANER_NOOP_CLEANER_IMPL_H_
+#define CHROME_CHROME_CLEANER_CLEANER_NOOP_CLEANER_IMPL_H_
 
 #include <vector>
 
-#include "chrome_cleaner/cleaner/cleaner.h"
+#include "chrome/chrome_cleaner/cleaner/cleaner.h"
 
 namespace chrome_cleaner {
 
@@ -31,4 +31,4 @@ class NoopCleanerImpl : public Cleaner {
 
 }  // namespace chrome_cleaner
 
-#endif  // CHROME_CLEANER_CLEANER_NOOP_CLEANER_IMPL_H_
+#endif  // CHROME_CHROME_CLEANER_CLEANER_NOOP_CLEANER_IMPL_H_

chrome/chrome_cleaner/constants/chrome_cleaner_switches.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome_cleaner/constants/chrome_cleaner_switches.h"
+#include "chrome/chrome_cleaner/constants/chrome_cleaner_switches.h"
 
 namespace chrome_cleaner {
 

chrome/chrome_cleaner/constants/chrome_cleaner_switches.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_CLEANER_CONSTANTS_CHROME_CLEANER_SWITCHES_H_
-#define CHROME_CLEANER_CONSTANTS_CHROME_CLEANER_SWITCHES_H_
+#ifndef CHROME_CHROME_CLEANER_CONSTANTS_CHROME_CLEANER_SWITCHES_H_
+#define CHROME_CHROME_CLEANER_CONSTANTS_CHROME_CLEANER_SWITCHES_H_
 
 namespace chrome_cleaner {
 
@@ -50,4 +50,4 @@ extern const char kAllowUnsecureDLLsSwitch[];
 
 }  // namespace chrome_cleaner
 
-#endif  // CHROME_CLEANER_CONSTANTS_CHROME_CLEANER_SWITCHES_H_
+#endif  // CHROME_CHROME_CLEANER_CONSTANTS_CHROME_CLEANER_SWITCHES_H_

chrome/chrome_cleaner/constants/common_registry_names.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome_cleaner/constants/common_registry_names.h"
+#include "chrome/chrome_cleaner/constants/common_registry_names.h"
 
 namespace chrome_cleaner {
 

chrome/chrome_cleaner/constants/common_registry_names.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_CLEANER_CONSTANTS_COMMON_REGISTRY_NAMES_H_
-#define CHROME_CLEANER_CONSTANTS_COMMON_REGISTRY_NAMES_H_
+#ifndef CHROME_CHROME_CLEANER_CONSTANTS_COMMON_REGISTRY_NAMES_H_
+#define CHROME_CHROME_CLEANER_CONSTANTS_COMMON_REGISTRY_NAMES_H_
 
 namespace chrome_cleaner {
 
@@ -14,4 +14,4 @@ extern const wchar_t kAppInitDllsValueName[];
 
 }  // namespace chrome_cleaner
 
-#endif  // CHROME_CLEANER_CONSTANTS_COMMON_REGISTRY_NAMES_H_
+#endif  // CHROME_CHROME_CLEANER_CONSTANTS_COMMON_REGISTRY_NAMES_H_

chrome/chrome_cleaner/constants/uws_id.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_CLEANER_CONSTANTS_UWS_ID_H_
-#define CHROME_CLEANER_CONSTANTS_UWS_ID_H_
+#ifndef CHROME_CHROME_CLEANER_CONSTANTS_UWS_ID_H_
+#define CHROME_CHROME_CLEANER_CONSTANTS_UWS_ID_H_
 
 namespace chrome_cleaner {
 
@@ -12,4 +12,4 @@ typedef unsigned int UwSId;
 
 }  // namespace chrome_cleaner
 
-#endif  // CHROME_CLEANER_CONSTANTS_UWS_ID_H_
+#endif  // CHROME_CHROME_CLEANER_CONSTANTS_UWS_ID_H_

components/chrome_cleaner/OWNERS

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