Merge ChromeServiceTabLauncher and ServiceTabLauncher

chrome/browser/android/service_tab_launcher.h

Index: chrome/browser/android/service_tab_launcher.h
diff --git a/components/service_tab_launcher/browser/android/service_tab_launcher.h b/chrome/browser/android/service_tab_launcher.h
similarity index 81%
rename from components/service_tab_launcher/browser/android/service_tab_launcher.h
rename to chrome/browser/android/service_tab_launcher.h
index 004e78bf6d323894765b8517c22ab2f0596afe19..950d4a1f52c068d65b20722ca360478a6c2da49e 100644
--- a/components/service_tab_launcher/browser/android/service_tab_launcher.h
+++ b/chrome/browser/android/service_tab_launcher.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 COMPONENTS_SERVICE_TAB_LAUNCHER_BROWSER_ANDROID_SERVICE_TAB_LAUNCHER_H_
-#define COMPONENTS_SERVICE_TAB_LAUNCHER_BROWSER_ANDROID_SERVICE_TAB_LAUNCHER_H_
+#ifndef CHROME_BROWSER_ANDROID_CHROME_SERVICE_TAB_LAUNCHER_H_
+#define CHROME_BROWSER_ANDROID_CHROME_SERVICE_TAB_LAUNCHER_H_
 
 #include "base/android/jni_android.h"
 #include "base/callback_forward.h"
@@ -17,8 +17,6 @@ struct OpenURLParams;
 class WebContents;
 }
 
-namespace service_tab_launcher {
-
 // Launcher for creating new tabs on Android from a background service, where
 // there may not necessarily be an Activity or a tab model at all. When the
 // tab has been launched, the user of this class will be informed with the
@@ -42,7 +40,7 @@ class ServiceTabLauncher {
   // the provisional load for the main frame of the navigation.
   void OnTabLaunched(int request_id, content::WebContents* web_contents);
 
-  static bool RegisterServiceTabLauncher(JNIEnv* env);
+  static bool Register(JNIEnv* env);
 
  private:
   friend struct base::DefaultSingletonTraits<ServiceTabLauncher>;
@@ -52,11 +50,7 @@ class ServiceTabLauncher {
 
   IDMap<TabLaunchedCallback, IDMapOwnPointer> tab_launched_callbacks_;
 
-  base::android::ScopedJavaGlobalRef<jobject> java_object_;
-
   DISALLOW_COPY_AND_ASSIGN(ServiceTabLauncher);
 };
 
-}  // namespace service_tab_launcher
-
-#endif  // COMPONENTS_SERVICE_TAB_LAUNCHER_BROWSER_ANDROID_SERVICE_TAB_LAUNCHER_H_
+#endif  // CHROME_BROWSER_ANDROID_CHROME_SERVICE_TAB_LAUNCHER_H_