Upstream oodles of Chrome for Android code into Chromium.

chrome/android/javatests/src/org/chromium/chrome/browser/services/GoogleServicesManagerIntegrationTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/services/GoogleServicesManagerIntegrationTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/services/GoogleServicesManagerIntegrationTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/services/GoogleServicesManagerIntegrationTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..23fdf7fc9c1d12482a7ab23be86200785772135f
--- /dev/null
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/services/GoogleServicesManagerIntegrationTest.java
@@ -0,0 +1,37 @@
+// 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.services;
+
+import android.test.UiThreadTest;
+
+import org.chromium.base.test.util.DisabledTest;
+import org.chromium.chrome.browser.ChromeActivity;
+import org.chromium.chrome.test.ChromeActivityTestCaseBase;
+
+public class GoogleServicesManagerIntegrationTest
+        extends ChromeActivityTestCaseBase<ChromeActivity> {
+
+    public GoogleServicesManagerIntegrationTest() {
+        super(ChromeActivity.class);
+    }
+
+    /**
+     * Test changing the state of auto login
+     * Bug: crbug.com/413289
+     * @Smoke
+     * @SmallTest
+     * @Feature({"Sync", "Main"})
+     */
+    @DisabledTest
+    @UiThreadTest
+    public void testSetAutologinState() {
+        // TODO(acleung): Add back some sort of test for the GSM.
+    }
+
+    @Override
+    public void startMainActivity() throws InterruptedException {
+        startMainActivityOnBlankPage();
+    }
+}