Peter Beverloo: How do you suggest that I do the merging?

I am tempted to un-componentize service_tab_launcher (i.e. revert https://codereview.chromium.org/1057533005)

Alternatively, I can add ServiceTabLauncher#setInstance() and make something in chrome/ call that

peter@ Ping!

+mathiash

Since the implementation explicitly depends on //chrome, I don't think that there's a way for us to merge them without moving it back there unfortunately.

Opera were the ones componentizing the code because they depend on it, so we should exercise some caution here. Would this cause problems for you, Mathias?

mathiash@ Ping!

Given that this caused an obscure ProGuard issue too (Issue 624477), let's merge them together again.

pkotwicz@, is this something you'd want to pick up?

Yes, I will do this :)

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/aa289f074c16619af0b14083a3e48a0224ea7e57

commit aa289f074c16619af0b14083a3e48a0224ea7e57
Author: pkotwicz <pkotwicz@chromium.org>
Date: Tue Jul 05 22:26:22 2016

Merge ChromeServiceTabLauncher and ServiceTabLauncher

BUG= 614594 
R=yfriedman
TBR=peter

Review-Url: https://codereview.chromium.org/2119273002
Cr-Commit-Position: refs/heads/master@{#403829}

[modify] https://crrev.com/aa289f074c16619af0b14083a3e48a0224ea7e57/chrome/android/BUILD.gn
[modify] https://crrev.com/aa289f074c16619af0b14083a3e48a0224ea7e57/chrome/android/java/AndroidManifest.xml
[modify] https://crrev.com/aa289f074c16619af0b14083a3e48a0224ea7e57/chrome/android/java/DEPS
[rename] https://crrev.com/aa289f074c16619af0b14083a3e48a0224ea7e57/chrome/android/java/src/org/chromium/chrome/browser/ServiceTabLauncher.java
[modify] https://crrev.com/aa289f074c16619af0b14083a3e48a0224ea7e57/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
[modify] https://crrev.com/aa289f074c16619af0b14083a3e48a0224ea7e57/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/AsyncTabCreationParams.java
[modify] https://crrev.com/aa289f074c16619af0b14083a3e48a0224ea7e57/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/TabDelegate.java
[modify] https://crrev.com/aa289f074c16619af0b14083a3e48a0224ea7e57/chrome/android/java_sources.gni
[modify] https://crrev.com/aa289f074c16619af0b14083a3e48a0224ea7e57/chrome/browser/BUILD.gn
[modify] https://crrev.com/aa289f074c16619af0b14083a3e48a0224ea7e57/chrome/browser/android/DEPS
[modify] https://crrev.com/aa289f074c16619af0b14083a3e48a0224ea7e57/chrome/browser/android/chrome_jni_registrar.cc
[rename] https://crrev.com/aa289f074c16619af0b14083a3e48a0224ea7e57/chrome/browser/android/service_tab_launcher.cc
[rename] https://crrev.com/aa289f074c16619af0b14083a3e48a0224ea7e57/chrome/browser/android/service_tab_launcher.h
[modify] https://crrev.com/aa289f074c16619af0b14083a3e48a0224ea7e57/chrome/browser/chrome_content_browser_client.cc
[modify] https://crrev.com/aa289f074c16619af0b14083a3e48a0224ea7e57/chrome/chrome.gyp
[modify] https://crrev.com/aa289f074c16619af0b14083a3e48a0224ea7e57/chrome/chrome_browser.gypi
[modify] https://crrev.com/aa289f074c16619af0b14083a3e48a0224ea7e57/components/components.gyp
[delete] https://crrev.com/6b83939340b453504f8d5d38ba774d4f07324dd5/components/service_tab_launcher.gypi
[delete] https://crrev.com/6b83939340b453504f8d5d38ba774d4f07324dd5/components/service_tab_launcher/BUILD.gn
[delete] https://crrev.com/6b83939340b453504f8d5d38ba774d4f07324dd5/components/service_tab_launcher/DEPS
[delete] https://crrev.com/6b83939340b453504f8d5d38ba774d4f07324dd5/components/service_tab_launcher/OWNERS
[delete] https://crrev.com/6b83939340b453504f8d5d38ba774d4f07324dd5/components/service_tab_launcher/android/DEPS
[delete] https://crrev.com/6b83939340b453504f8d5d38ba774d4f07324dd5/components/service_tab_launcher/android/java/src/org/chromium/components/service_tab_launcher/ServiceTabLauncher.java
[delete] https://crrev.com/6b83939340b453504f8d5d38ba774d4f07324dd5/components/service_tab_launcher/component_jni_registrar.cc
[delete] https://crrev.com/6b83939340b453504f8d5d38ba774d4f07324dd5/components/service_tab_launcher/component_jni_registrar.h