Defines initial DeviceConditions and and plumbs down through StartProcessing() call.

chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtils.java

Index: chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtils.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtils.java
index 9e195bcd6030e0ed6282d4740642200a147ccbf3..3002a603014b0f8b8da30980bcade936c21973d5 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtils.java
@@ -201,28 +201,37 @@ public class OfflinePageUtils {
         };
     }
 
+    public static DeviceConditions getDeviceConditions(Context context) {
+        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
+        // Note this is a sticky intent, so we aren't really registering a receiver, just getting
+        // the sticky intent.  That means that we don't need to unregister the filter later.
+        Intent batteryStatus = context.registerReceiver(null, filter);
+        if (batteryStatus == null) return null;
+
+        return new DeviceConditions(isPowerConnected(batteryStatus),
+                batteryPercentage(batteryStatus),
+                NetworkChangeNotifier.getInstance().getCurrentConnectionType());

[Pete Williamson, 2016/06/16 17:46:26]

So what Does the NetworkChangeNotifier return if we have both 2G and WiFi? 
Maybe the most recently connected of the two?  I suspect we'd really prefer to
know about WiFi if both are connected, since it will be the more limiting case,
can we do that?  (OK to add a TODO if it is hard, it looks like it might require
modifying NetworkChangeNotifier).

[dougarnett, 2016/06/16 21:03:07]

It returns the default connection type - eg, the one used unless for network
request unless a specific network type is requested for that request (something
possible with Lollipop forward). Pretty sure this is what we want for now.

For Lollipop+, it is possible to get list of connected network types
(GetConnectedNetworks) if we do want to do something fancy in the future (but
likely means having some affect over choosing what network would be used to be
interesting).

[Pete Williamson, 2016/06/16 22:43:57]

Acknowledged.

+    }
+
     /**
      * Records UMA data when the Offline Pages Background Load service awakens.
      * @param context android context
      */
     public static void recordWakeupUMA(Context context, long taskScheduledTimeMillis) {
-        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
-        // Note this is a sticky intent, so we aren't really registering a receiver, just getting
-        // the sticky intent.  That means that we don't need to unregister the filter later.
-        Intent batteryStatus = context.registerReceiver(null, filter);
-        if (batteryStatus == null) return;
+        DeviceConditions deviceConditions = getDeviceConditions(context);
+        if (deviceConditions == null) return;
 
         // Report charging state.
         RecordHistogram.recordBooleanHistogram(
-                "OfflinePages.Wakeup.ConnectedToPower", isPowerConnected(batteryStatus));
+                "OfflinePages.Wakeup.ConnectedToPower", deviceConditions.isPowerConnected());
 
         // Report battery percentage.
         RecordHistogram.recordPercentageHistogram(
-                "OfflinePages.Wakeup.BatteryPercentage", batteryPercentage(batteryStatus));
+                "OfflinePages.Wakeup.BatteryPercentage", deviceConditions.getBatteryPercentage());
 
         // Report the default network found (or none, if we aren't connected).
-        int connectionType = NetworkChangeNotifier.getInstance().getCurrentConnectionType();
-        Log.d(TAG, "Found single network of type " + connectionType);
+        int connectionType = deviceConditions.getNetConnectionType();
+        Log.d(TAG, "Found default network of type " + connectionType);
         RecordHistogram.recordEnumeratedHistogram("OfflinePages.Wakeup.NetworkAvailable",
                 connectionType, ConnectionType.CONNECTION_LAST + 1);