Merge java_staging/src into java/src.

chrome/android/java_staging/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionService.java

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionService.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionService.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionService.java
deleted file mode 100644
index 1a64f3a5289a3b8529c43c9a4b3662cb650ba650..0000000000000000000000000000000000000000
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionService.java
+++ /dev/null
@@ -1,34 +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.
-
-package org.chromium.chrome.browser.customtabs;
-
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-
-import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
-
-/**
- * Custom tabs connection service, used by the embedded Chrome activities.
- */
-public class CustomTabsConnectionService extends Service {
-    @Override
-    public void onCreate() {
-        super.onCreate();
-    }
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        if (!ChromePreferenceManager.getInstance(this).getCustomTabsEnabled()) return null;
-
-        return (IBinder) CustomTabsConnection.getInstance(getApplication());
-    }
-
-    @Override
-    public boolean onUnbind(Intent intent) {
-        super.onUnbind(intent);
-        return false; // No support for onRebind().
-    }
-}