Merge ChromeServiceTabLauncher and ServiceTabLauncher

chrome/browser/android/service_tab_launcher.cc

Index: chrome/browser/android/service_tab_launcher.cc
diff --git a/components/service_tab_launcher/browser/android/service_tab_launcher.cc b/chrome/browser/android/service_tab_launcher.cc
similarity index 77%
rename from components/service_tab_launcher/browser/android/service_tab_launcher.cc
rename to chrome/browser/android/service_tab_launcher.cc
index f4691815f690833fae1fce95bad9fc5444078064..dc80eac636024d474394471c9211bc86c9301080 100644
--- a/components/service_tab_launcher/browser/android/service_tab_launcher.cc
+++ b/chrome/browser/android/service_tab_launcher.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 "components/service_tab_launcher/browser/android/service_tab_launcher.h"
+#include "chrome/browser/android/service_tab_launcher.h"
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_string.h"
@@ -22,36 +22,24 @@ void OnWebContentsForRequestAvailable(
     const JavaParamRef<jclass>& clazz,
     jint request_id,
     const JavaParamRef<jobject>& android_web_contents) {
-  service_tab_launcher::ServiceTabLauncher::GetInstance()->OnTabLaunched(
+  ServiceTabLauncher::GetInstance()->OnTabLaunched(
       request_id,
       content::WebContents::FromJavaWebContents(android_web_contents));
 }
 
-namespace service_tab_launcher {
-
 // static
 ServiceTabLauncher* ServiceTabLauncher::GetInstance() {
   return base::Singleton<ServiceTabLauncher>::get();
 }
 
 ServiceTabLauncher::ServiceTabLauncher() {
-  java_object_.Reset(
-      Java_ServiceTabLauncher_getInstance(AttachCurrentThread(),
-                                          GetApplicationContext()));
 }
 
 ServiceTabLauncher::~ServiceTabLauncher() {}
 
-void ServiceTabLauncher::LaunchTab(
-    content::BrowserContext* browser_context,
-    const content::OpenURLParams& params,
-    const TabLaunchedCallback& callback) {
-  if (!java_object_.obj()) {
-    LOG(ERROR) << "No ServiceTabLauncher is available to launch a new tab.";
-    callback.Run(nullptr);
-    return;
-  }
-
+void ServiceTabLauncher::LaunchTab(content::BrowserContext* browser_context,
+                                   const content::OpenURLParams& params,
+                                   const TabLaunchedCallback& callback) {
   WindowOpenDisposition disposition = params.disposition;
   if (disposition != NEW_WINDOW && disposition != NEW_POPUP &&
       disposition != NEW_FOREGROUND_TAB && disposition != NEW_BACKGROUND_TAB) {
@@ -75,7 +63,6 @@ void ServiceTabLauncher::LaunchTab(
   DCHECK_GE(request_id, 1);
 
   Java_ServiceTabLauncher_launchTab(env,
-                                    java_object_.obj(),
                                     GetApplicationContext(),
                                     request_id,
                                     browser_context->IsOffTheRecord(),
@@ -98,8 +85,6 @@ void ServiceTabLauncher::OnTabLaunched(int request_id,
   tab_launched_callbacks_.Remove(request_id);
 }
 
-bool ServiceTabLauncher::RegisterServiceTabLauncher(JNIEnv* env) {
+bool ServiceTabLauncher::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
-
-}  // namespace service_tab_launcher