Reland "Move notification_helper/ to chrome/notification_helper/"

This is a reland of 850001f395fe619b3add0fdb80a1cfbd7d32df01, which caused
a pre-submit deadlock for chrome/browser/notifications/OWNERS.

This is now safe to land as the following CL has been landed:
https://chromium-review.googlesource.com/c/chromium/src/+/1024633

Original change's description:
> Move notification_helper/ to chrome/notification_helper/
>
> ... plus all the necessary code migration. A follow-up CL will be used
> to update relevant comments.
>
> Bug: 734095
> Change-Id: I8516c750518e10a366bdc1496e75a3c2f4f0898b
> Reviewed-on: https://chromium-review.googlesource.com/1022957
> Reviewed-by: John Abd-El-Malek <jam@chromium.org>
> Commit-Queue: Xi Cheng <chengx@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#552762}

Bug: 734095
Change-Id: Id4e0818d7e3ea2b0ea7633e883bc5cea42705167
Reviewed-on: https://chromium-review.googlesource.com/1024744
Commit-Queue: Xi Cheng <chengx@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Reviewed-by: Xi Cheng <chengx@chromium.org>
Cr-Commit-Position: refs/heads/master@{#552971}

diff --git a/BUILD.gn b/BUILD.gn
index 24e7935c..9267031 100644
--- a/BUILD.gn
+++ b/BUILD.gn

@@ -579,6 +579,7 @@
       "//chrome/install_static:install_static_unittests",
       "//chrome/installer/gcapi",
       "//chrome/installer/setup:setup_unittests",
+      "//chrome/notification_helper:notification_helper_unittests",
       "//chrome_elf:chrome_elf_import_unittests",
       "//chrome_elf:chrome_elf_unittests",
       "//chrome_elf:dll_hash_main",
@@ -587,7 +588,6 @@
       "//components/zucchini",
       "//net:quic_client",
       "//net:quic_server",
-      "//notification_helper:notification_helper_unittests",
       "//sandbox/win:pocdll",
       "//sandbox/win:sandbox_poc",
       "//sandbox/win:sbox_integration_tests",

diff --git a/WATCHLISTS b/WATCHLISTS
index add8e54..8954417c 100644
--- a/WATCHLISTS
+++ b/WATCHLISTS

@@ -1167,7 +1167,7 @@
         'content/public/browser/platform_notification|'\
         'content/public/common/platform_notification|'\
         'content/renderer/notification_|'\
-        'notification_helper/|'\
+        'chrome/notification_helper/|'\
         'third_party/WebKit/LayoutTests/external/wpt/notifications|'\
         'third_party/WebKit/LayoutTests/http/tests/notifications|'\
         'third_party/blink/renderer/modules/notifications|'\

diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index bc6b6d37..009a281d 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn

@@ -215,7 +215,7 @@
         ]
         data_deps = [
           "//chrome/app/version_assembly:version_assembly_manifest",
-          "//notification_helper",
+          "//chrome/notification_helper",
         ]
 
         if (win_console_app) {

diff --git a/notification_helper/BUILD.gn b/chrome/notification_helper/BUILD.gn
similarity index 100%
rename from notification_helper/BUILD.gn
rename to chrome/notification_helper/BUILD.gn

diff --git a/notification_helper/DEPS b/chrome/notification_helper/DEPS
similarity index 100%
rename from notification_helper/DEPS
rename to chrome/notification_helper/DEPS

diff --git a/notification_helper/OWNERS b/chrome/notification_helper/OWNERS
similarity index 100%
rename from notification_helper/OWNERS
rename to chrome/notification_helper/OWNERS

diff --git a/notification_helper/README.md b/chrome/notification_helper/README.md
similarity index 100%
rename from notification_helper/README.md
rename to chrome/notification_helper/README.md

diff --git a/notification_helper/com_server_module.cc b/chrome/notification_helper/com_server_module.cc
similarity index 96%
rename from notification_helper/com_server_module.cc
rename to chrome/notification_helper/com_server_module.cc
index 33deb0fc..f4134fd4 100644
--- a/notification_helper/com_server_module.cc
+++ b/chrome/notification_helper/com_server_module.cc

@@ -9,14 +9,14 @@
 #define __WRL_CLASSIC_COM_STRICT__
 #endif  // __WRL_CLASSIC_COM_STRICT__
 
-#include "notification_helper/com_server_module.h"
+#include "chrome/notification_helper/com_server_module.h"
 
 #include <wrl/module.h>
 
 #include "base/metrics/histogram_macros.h"
 #include "chrome/install_static/install_util.h"
-#include "notification_helper/notification_activator.h"
-#include "notification_helper/trace_util.h"
+#include "chrome/notification_helper/notification_activator.h"
+#include "chrome/notification_helper/trace_util.h"
 
 namespace {
 

diff --git a/notification_helper/com_server_module.h b/chrome/notification_helper/com_server_module.h
similarity index 89%
rename from notification_helper/com_server_module.h
rename to chrome/notification_helper/com_server_module.h
index 60374e6..c99391b 100644
--- a/notification_helper/com_server_module.h
+++ b/chrome/notification_helper/com_server_module.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 NOTIFICATION_HELPER_COM_SERVER_MODULE_H_
-#define NOTIFICATION_HELPER_COM_SERVER_MODULE_H_
+#ifndef CHROME_NOTIFICATION_HELPER_COM_SERVER_MODULE_H_
+#define CHROME_NOTIFICATION_HELPER_COM_SERVER_MODULE_H_
 
 #include "base/synchronization/waitable_event.h"
 #include "base/win/windows_types.h"
@@ -51,4 +51,4 @@
 
 }  // namespace notification_helper
 
-#endif  // NOTIFICATION_HELPER_COM_SERVER_MODULE_H_
+#endif  // CHROME_NOTIFICATION_HELPER_COM_SERVER_MODULE_H_

diff --git a/notification_helper/com_server_module_unittest.cc b/chrome/notification_helper/com_server_module_unittest.cc
similarity index 97%
rename from notification_helper/com_server_module_unittest.cc
rename to chrome/notification_helper/com_server_module_unittest.cc
index b1ba787..e2090f7c 100644
--- a/notification_helper/com_server_module_unittest.cc
+++ b/chrome/notification_helper/com_server_module_unittest.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 "notification_helper/com_server_module.h"
+#include "chrome/notification_helper/com_server_module.h"
 
 #include <memory>
 

diff --git a/notification_helper/notification_activator.cc b/chrome/notification_helper/notification_activator.cc
similarity index 94%
rename from notification_helper/notification_activator.cc
rename to chrome/notification_helper/notification_activator.cc
index 51a926e..19d6f1c 100644
--- a/notification_helper/notification_activator.cc
+++ b/chrome/notification_helper/notification_activator.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 "notification_helper/notification_activator.h"
+#include "chrome/notification_helper/notification_activator.h"
 
 #include <shellapi.h>
 
@@ -10,8 +10,8 @@
 #include "base/strings/string16.h"
 #include "base/win/windows_types.h"
 #include "chrome/common/chrome_switches.h"
-#include "notification_helper/notification_helper_util.h"
-#include "notification_helper/trace_util.h"
+#include "chrome/notification_helper/notification_helper_util.h"
+#include "chrome/notification_helper/trace_util.h"
 
 namespace {
 

diff --git a/notification_helper/notification_activator.h b/chrome/notification_helper/notification_activator.h
similarity index 87%
rename from notification_helper/notification_activator.h
rename to chrome/notification_helper/notification_activator.h
index 77c3d97..5f7e1f69 100644
--- a/notification_helper/notification_activator.h
+++ b/chrome/notification_helper/notification_activator.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 NOTIFICATION_HELPER_NOTIFICATION_ACTIVATOR_H_
-#define NOTIFICATION_HELPER_NOTIFICATION_ACTIVATOR_H_
+#ifndef CHROME_NOTIFICATION_HELPER_NOTIFICATION_ACTIVATOR_H_
+#define CHROME_NOTIFICATION_HELPER_NOTIFICATION_ACTIVATOR_H_
 
 #include <NotificationActivationCallback.h>
 #include <wrl/implements.h>
@@ -39,4 +39,4 @@
 
 }  // namespace notification_helper
 
-#endif  // NOTIFICATION_HELPER_NOTIFICATION_ACTIVATOR_H_
+#endif  // CHROME_NOTIFICATION_HELPER_NOTIFICATION_ACTIVATOR_H_

diff --git a/notification_helper/notification_helper.cc b/chrome/notification_helper/notification_helper.cc
similarity index 92%
rename from notification_helper/notification_helper.cc
rename to chrome/notification_helper/notification_helper.cc
index 00f2be4c..d7e61f6 100644
--- a/notification_helper/notification_helper.cc
+++ b/chrome/notification_helper/notification_helper.cc

@@ -15,10 +15,10 @@
 #include "base/win/scoped_winrt_initializer.h"
 #include "chrome/install_static/product_install_details.h"
 #include "chrome/install_static/user_data_dir.h"
-#include "notification_helper/com_server_module.h"
-#include "notification_helper/notification_helper_crash_reporter_client.h"
-#include "notification_helper/notification_helper_util.h"
-#include "notification_helper/trace_util.h"
+#include "chrome/notification_helper/com_server_module.h"
+#include "chrome/notification_helper/notification_helper_crash_reporter_client.h"
+#include "chrome/notification_helper/notification_helper_util.h"
+#include "chrome/notification_helper/trace_util.h"
 
 extern "C" int WINAPI wWinMain(HINSTANCE instance,
                                HINSTANCE prev_instance,

diff --git a/notification_helper/notification_helper.rc b/chrome/notification_helper/notification_helper.rc
similarity index 100%
rename from notification_helper/notification_helper.rc
rename to chrome/notification_helper/notification_helper.rc

diff --git a/notification_helper/notification_helper_crash_reporter_client.cc b/chrome/notification_helper/notification_helper_crash_reporter_client.cc
similarity index 98%
rename from notification_helper/notification_helper_crash_reporter_client.cc
rename to chrome/notification_helper/notification_helper_crash_reporter_client.cc
index 45d975dc..8ad401ed 100644
--- a/notification_helper/notification_helper_crash_reporter_client.cc
+++ b/chrome/notification_helper/notification_helper_crash_reporter_client.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 "notification_helper/notification_helper_crash_reporter_client.h"
+#include "chrome/notification_helper/notification_helper_crash_reporter_client.h"
 
 #include <memory>
 

diff --git a/notification_helper/notification_helper_crash_reporter_client.h b/chrome/notification_helper/notification_helper_crash_reporter_client.h
similarity index 90%
rename from notification_helper/notification_helper_crash_reporter_client.h
rename to chrome/notification_helper/notification_helper_crash_reporter_client.h
index 111cf0a..e39d1ee2 100644
--- a/notification_helper/notification_helper_crash_reporter_client.h
+++ b/chrome/notification_helper/notification_helper_crash_reporter_client.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 NOTIFICATION_HELPER_NOTIFICATION_HELPER_CRASH_REPORTER_CLIENT_H_
-#define NOTIFICATION_HELPER_NOTIFICATION_HELPER_CRASH_REPORTER_CLIENT_H_
+#ifndef CHROME_NOTIFICATION_HELPER_NOTIFICATION_HELPER_CRASH_REPORTER_CLIENT_H_
+#define CHROME_NOTIFICATION_HELPER_NOTIFICATION_HELPER_CRASH_REPORTER_CLIENT_H_
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
@@ -51,4 +51,4 @@
   DISALLOW_COPY_AND_ASSIGN(NotificationHelperCrashReporterClient);
 };
 
-#endif  // NOTIFICATION_HELPER_NOTIFICATION_HELPER_CRASH_REPORTER_CLIENT_H_
+#endif  // CHROME_NOTIFICATION_HELPER_NOTIFICATION_HELPER_CRASH_REPORTER_CLIENT_H_

diff --git a/notification_helper/notification_helper_exe.ver b/chrome/notification_helper/notification_helper_exe.ver
similarity index 100%
rename from notification_helper/notification_helper_exe.ver
rename to chrome/notification_helper/notification_helper_exe.ver

diff --git a/notification_helper/notification_helper_process_unittest.cc b/chrome/notification_helper/notification_helper_process_unittest.cc
similarity index 100%
rename from notification_helper/notification_helper_process_unittest.cc
rename to chrome/notification_helper/notification_helper_process_unittest.cc

diff --git a/notification_helper/notification_helper_util.cc b/chrome/notification_helper/notification_helper_util.cc
similarity index 93%
rename from notification_helper/notification_helper_util.cc
rename to chrome/notification_helper/notification_helper_util.cc
index a7768745..c92e830 100644
--- a/notification_helper/notification_helper_util.cc
+++ b/chrome/notification_helper/notification_helper_util.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 "notification_helper/notification_helper_util.h"
+#include "chrome/notification_helper/notification_helper_util.h"
 
 #include "base/base_paths.h"
 #include "base/files/file_util.h"

diff --git a/notification_helper/notification_helper_util.h b/chrome/notification_helper/notification_helper_util.h
similarity index 66%
rename from notification_helper/notification_helper_util.h
rename to chrome/notification_helper/notification_helper_util.h
index b144187..20c6cfed 100644
--- a/notification_helper/notification_helper_util.h
+++ b/chrome/notification_helper/notification_helper_util.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 NOTIFICATION_HELPER_NOTIFICATION_HELPER_UTIL_H_
-#define NOTIFICATION_HELPER_NOTIFICATION_HELPER_UTIL_H_
+#ifndef CHROME_NOTIFICATION_HELPER_NOTIFICATION_HELPER_UTIL_H_
+#define CHROME_NOTIFICATION_HELPER_NOTIFICATION_HELPER_UTIL_H_
 
 #include "base/files/file_path.h"
 
@@ -14,4 +14,4 @@
 
 }  // namespace notification_helper
 
-#endif  // NOTIFICATION_HELPER_NOTIFICATION_HELPER_UTIL_H_
+#endif  // CHROME_NOTIFICATION_HELPER_NOTIFICATION_HELPER_UTIL_H_

diff --git a/notification_helper/run_all_unittests.cc b/chrome/notification_helper/run_all_unittests.cc
similarity index 100%
rename from notification_helper/run_all_unittests.cc
rename to chrome/notification_helper/run_all_unittests.cc

diff --git a/notification_helper/trace_util.cc b/chrome/notification_helper/trace_util.cc
similarity index 100%
rename from notification_helper/trace_util.cc
rename to chrome/notification_helper/trace_util.cc

diff --git a/notification_helper/trace_util.h b/chrome/notification_helper/trace_util.h
similarity index 70%
rename from notification_helper/trace_util.h
rename to chrome/notification_helper/trace_util.h
index 2b7028d6..44322ed 100644
--- a/notification_helper/trace_util.h
+++ b/chrome/notification_helper/trace_util.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 NOTIFICATION_HELPER_TRACE_UTIL_H_
-#define NOTIFICATION_HELPER_TRACE_UTIL_H_
+#ifndef CHROME_NOTIFICATION_HELPER_TRACE_UTIL_H_
+#define CHROME_NOTIFICATION_HELPER_TRACE_UTIL_H_
 
 #if defined(NDEBUG)
 #define Trace(format, ...) ((void)0)
@@ -12,4 +12,4 @@
 void TraceImpl(const wchar_t* format, ...);
 #endif  // defined(NDEBUG)
 
-#endif  // NOTIFICATION_HELPER_TRACE_UTIL_H_
+#endif  // CHROME_NOTIFICATION_HELPER_TRACE_UTIL_H_

diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index ea982194..f4bc2de 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn

@@ -3184,7 +3184,7 @@
 
       deps += [ "//chrome/installer/util:with_no_strings" ]
 
-      data_deps += [ "//notification_helper" ]
+      data_deps += [ "//chrome/notification_helper" ]
     }
   }
 

diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl
index 24f652d..b0944425 100644
--- a/testing/buildbot/gn_isolate_map.pyl
+++ b/testing/buildbot/gn_isolate_map.pyl

@@ -905,7 +905,7 @@
     "type": "additional_compile_target",
   },
   "notification_helper_unittests": {
-    "label": "//notification_helper:notification_helper_unittests",
+    "label": "//chrome/notification_helper:notification_helper_unittests",
     "type": "windowed_test_launcher",
   },
   "ocmock_support_unittests": {