Precache uses GcmNetworkManager for task scheduling

components/precache/android/javatests/src/org/chromium/components/precache/DeviceStateTest.java

Index: components/precache/android/javatests/src/org/chromium/components/precache/DeviceStateTest.java
diff --git a/components/precache/android/javatests/src/org/chromium/components/precache/DeviceStateTest.java b/components/precache/android/javatests/src/org/chromium/components/precache/DeviceStateTest.java
index 30c79b39b62596cb48c02444998923d47a634b07..6bbd982ac2c3d15f8770b8b4b0ba80d9f7c3fe7d 100644
--- a/components/precache/android/javatests/src/org/chromium/components/precache/DeviceStateTest.java
+++ b/components/precache/android/javatests/src/org/chromium/components/precache/DeviceStateTest.java
@@ -135,7 +135,7 @@ public class DeviceStateTest extends InstrumentationTestCase {
 
     @SmallTest
     @Feature({"Precache"})
-    public void testWifiAvailable() {
+    public void testUnmeteredNetworkAvailable() {
         AdvancedMockContext context = new AdvancedMockContext();
         DeviceState deviceState = DeviceState.getInstance();
 
@@ -144,41 +144,41 @@ public class DeviceStateTest extends InstrumentationTestCase {
         deviceState.setNetworkInfoDelegateFactory(
                 new MockNetworkInfoDelegateFactory(
                         true, ConnectivityManager.TYPE_WIFI, true, true, false, false));
-        assertTrue(deviceState.isWifiAvailable(context));
+        assertTrue(deviceState.isUnmeteredNetworkAvailable(context));
 
         // Expect WiFi to be reported as unavailable because one of the aforementioned required
         // conditions is not met.
         deviceState.setNetworkInfoDelegateFactory(
                 new MockNetworkInfoDelegateFactory(
                         false, ConnectivityManager.TYPE_WIFI, true, true, false, false));
-        assertFalse(deviceState.isWifiAvailable(context));
+        assertFalse(deviceState.isUnmeteredNetworkAvailable(context));
 
         deviceState.setNetworkInfoDelegateFactory(
                 new MockNetworkInfoDelegateFactory(true, 0, false, true, false, false));
-        assertFalse(deviceState.isWifiAvailable(context));
+        assertFalse(deviceState.isUnmeteredNetworkAvailable(context));
 
         deviceState.setNetworkInfoDelegateFactory(
                 new MockNetworkInfoDelegateFactory(
                         true, ConnectivityManager.TYPE_WIFI, false, true, false, false));
-        assertFalse(deviceState.isWifiAvailable(context));
+        assertFalse(deviceState.isUnmeteredNetworkAvailable(context));
 
         deviceState.setNetworkInfoDelegateFactory(
                 new MockNetworkInfoDelegateFactory(
                         true, ConnectivityManager.TYPE_WIFI, true, false, false, false));
-        assertFalse(deviceState.isWifiAvailable(context));
+        assertFalse(deviceState.isUnmeteredNetworkAvailable(context));
 
         deviceState.setNetworkInfoDelegateFactory(
                 new MockNetworkInfoDelegateFactory(
                         true, ConnectivityManager.TYPE_WIFI, true, true, true, false));
-        assertFalse(deviceState.isWifiAvailable(context));
+        assertFalse(deviceState.isUnmeteredNetworkAvailable(context));
 
         deviceState.setNetworkInfoDelegateFactory(
                 new MockNetworkInfoDelegateFactory(
                         true, ConnectivityManager.TYPE_WIFI, true, true, false, true));
-        assertFalse(deviceState.isWifiAvailable(context));
+        assertFalse(deviceState.isUnmeteredNetworkAvailable(context));
 
         deviceState.setNetworkInfoDelegateFactory(
                 new MockNetworkInfoDelegateFactory(true, 0, false, false, true, true));
-        assertFalse(deviceState.isWifiAvailable(context));
+        assertFalse(deviceState.isUnmeteredNetworkAvailable(context));
     }
 }