Upstream Android-specific net/ changes.

net/proxy/proxy_config_service_android.h

 // 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.
 
 #ifndef NET_PROXY_PROXY_CONFIG_SERVICE_ANDROID_H_
 #define NET_PROXY_PROXY_CONFIG_SERVICE_ANDROID_H_
 
 #include <string>
 
 #include "base/android/jni_android.h"
@@ skipping 43 matching lines @@
   // ProxyConfigService:
   // Called only on the network thread.
   virtual void AddObserver(Observer* observer) OVERRIDE;
   virtual void RemoveObserver(Observer* observer) OVERRIDE;
   virtual ConfigAvailability GetLatestProxyConfig(ProxyConfig* config) OVERRIDE;
 
  private:
   friend class ProxyConfigServiceAndroidTestBase;
   class Delegate;
 
-
   // For tests.
   ProxyConfigServiceAndroid(base::SequencedTaskRunner* network_task_runner,
                             base::SequencedTaskRunner* jni_task_runner,
                             GetPropertyCallback get_property_callback);
 
   // For tests.
   void ProxySettingsChanged();
 
   scoped_refptr<Delegate> delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceAndroid);
 };
 
 } // namespace net
 
 #endif // NET_PROXY_PROXY_CONFIG_SERVICE_ANDROID_H_