Merge ChromeServiceTabLauncher and ServiceTabLauncher

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index aa41274e9d4c3d901dd114a784aeff9a82c383c4..6709e424c3236919b80c4f9599224b5748799268 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -227,10 +227,10 @@
 #endif
 
 #if BUILDFLAG(ANDROID_JAVA_UI)
+#include "chrome/browser/android/chrome_service_tab_launcher.h"
 #include "chrome/browser/android/mojo/chrome_service_registrar_android.h"
 #include "chrome/browser/android/ntp/new_tab_page_url_handler.h"
 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"
-#include "components/service_tab_launcher/browser/android/service_tab_launcher.h"
 #endif
 
 #if defined(OS_ANDROID)
@@ -2871,8 +2871,8 @@ void ChromeContentBrowserClient::OpenURL(
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
 #if BUILDFLAG(ANDROID_JAVA_UI)
-  service_tab_launcher::ServiceTabLauncher::GetInstance()->LaunchTab(
-      browser_context, params, callback);
+  ChromeServiceTabLauncher::GetInstance()->LaunchTab(browser_context, params,
+                                                     callback);
 #else
   chrome::NavigateParams nav_params(
       Profile::FromBrowserContext(browser_context),