Fix race condition in NetworkChangeNotifier on Android.

net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java

 // Copyright (c) 2012 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.net;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ skipping 10 matching lines @@
  * ACCESS_NETWORK_STATE permission.
  */
 public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver
         implements ActivityStatus.Listener {
 
     private static final String TAG = "NetworkChangeNotifierAutoDetect";
 
     private final NetworkConnectivityIntentFilter mIntentFilter =
             new NetworkConnectivityIntentFilter();
 
-    private final NetworkChangeNotifier mOwner;
+    private final Observer mObserver;
 
     private final Context mContext;
     private boolean mRegistered;
     private int mConnectionType;
 
-    public NetworkChangeNotifierAutoDetect(NetworkChangeNotifier owner, Context context) {
-        mOwner = owner;
+    /**
+     * Observer notified on the UI thread whenever a new connection type was detected.
+     */
+    public static interface Observer {
+        public void onConnectionTypeChanged(int newConnectionType);
+    }
+
+    public NetworkChangeNotifierAutoDetect(Observer observer, Context context) {
+        mObserver = observer;
         mContext = context;
         mConnectionType = currentConnectionType(context);
 
         ActivityStatus status = ActivityStatus.getInstance();
         if (!status.isPaused()) {
           registerReceiver();
         }
         status.registerListener(this);
     }
 
-    public int connectionType() {
-        return mConnectionType;
-    }
-
     public void destroy() {
         unregisterReceiver();
     }
 
     /**
      * Register a BroadcastReceiver in the given context.
      */
     private void registerReceiver() {
         if (!mRegistered) {
           mRegistered = true;
@@ skipping 59 matching lines @@
     // BroadcastReceiver
     @Override
     public void onReceive(Context context, Intent intent) {
         boolean noConnection =
                 intent.getBooleanExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, false);
         int newConnectionType = noConnection ?
                 NetworkChangeNotifier.CONNECTION_NONE : currentConnectionType(context);
 
         if (newConnectionType != mConnectionType) {
             mConnectionType = newConnectionType;
-            Log.d(TAG, "Network connectivity changed, type is: " + mConnectionType);
-            mOwner.notifyNativeObservers();
+            Log.d(TAG, "Network connectivity changed, type is: " + newConnectionType);
+            mObserver.onConnectionTypeChanged(newConnectionType);
         }
     }
 
     // AcitivityStatus.Listener
     @Override
     public void onActivityStatusChanged(boolean isPaused) {
         if (isPaused) {
             unregisterReceiver();
         } else {
             registerReceiver();
         }
     }
 
     private static class NetworkConnectivityIntentFilter extends IntentFilter {
         NetworkConnectivityIntentFilter() {
                 addAction(ConnectivityManager.CONNECTIVITY_ACTION);
         }
     }
 }