Merge ChromeServiceTabLauncher and ServiceTabLauncher

components/service_tab_launcher/component_jni_registrar.cc

Index: components/service_tab_launcher/component_jni_registrar.cc
diff --git a/components/service_tab_launcher/component_jni_registrar.cc b/components/service_tab_launcher/component_jni_registrar.cc
deleted file mode 100644
index cb5b3c7a4c29aeb3f0bbd84f10f7ba7d41309e28..0000000000000000000000000000000000000000
--- a/components/service_tab_launcher/component_jni_registrar.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "components/service_tab_launcher/component_jni_registrar.h"
-
-#include "base/android/jni_android.h"
-#include "base/android/jni_registrar.h"
-#include "base/macros.h"
-#include "components/service_tab_launcher/browser/android/service_tab_launcher.h"
-
-namespace service_tab_launcher {
-
-static base::android::RegistrationMethod kComponentRegisteredMethods[] = {
-  { "ServiceTabLauncher", ServiceTabLauncher::RegisterServiceTabLauncher },
-};
-
-bool RegisterServiceTabLauncherJni(JNIEnv* env) {
-  return RegisterNativeMethods(env,
-      kComponentRegisteredMethods, arraysize(kComponentRegisteredMethods));
-}
-
-} // namespace service_tab_launcher
-