Add native-side unit test for Android NetworkChangeNotifier

net/base/network_change_notifier.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_BASE_NETWORK_CHANGE_NOTIFIER_H_
 #define NET_BASE_NETWORK_CHANGE_NOTIFIER_H_
 
 #include "base/basictypes.h"
 #include "base/observer_list_threadsafe.h"
 #include "net/base/net_export.h"
 
 class GURL;
 
 namespace net {
 
 struct DnsConfig;
 class HistogramWatcher;
 class NetworkChangeNotifierFactory;
 
+#if defined(OS_ANDROID)

[szym, 2012/09/14 19:07:29]

You shouldn't need to forward declare for friend declaration. See
NetworkChangeNotifierWinTest.

[szym, 2012/09/14 19:26:34]

:( Apparently this is not true if you want to friend a class from another
namespace.

http://stackoverflow.com/questions/4492062/why-does-a-c-friend-class-need-a-f...

[szym, 2012/09/14 19:28:38]

Still, I wonder if you need #if defined.

[gone, 2012/09/15 01:01:55]

Seems like it's fine to remove.  Had some issues with the android namespace
prior to this, so getting rid of it was kind of a boon.

+namespace android {
+class NetworkChangeNotifierAndroidTest;
+}
+#endif
+
 #if defined(OS_LINUX)
 namespace internal {
 class AddressTrackerLinux;
 }
 #endif
 
 // NetworkChangeNotifier monitors the system for network changes, and notifies
 // registered observers of those events.  Observers may register on any thread,
 // and will be called back on the thread from which they registered.
 // NetworkChangeNotifiers are threadsafe, though they must be created and
@@ skipping 160 matching lines @@
   static void NotifyObserversOfDNSChange();
 
   // Stores |config| in NetworkState and notifies observers.
   static void SetDnsConfig(const DnsConfig& config);
 
  private:
   friend class HostResolverImplDnsTest;
   friend class NetworkChangeNotifierLinuxTest;
   friend class NetworkChangeNotifierWinTest;
 
+#if defined(OS_ANDROID)

[szym, 2012/09/14 19:07:29]

No need for #if here.

[gone, 2012/09/15 01:01:55]

Done.

+  friend class net::android::NetworkChangeNotifierAndroidTest;
+#endif
+
   class NetworkState;
 
   // Allows a second NetworkChangeNotifier to be created for unit testing, so
   // the test suite can create a MockNetworkChangeNotifier, but platform
   // specific NetworkChangeNotifiers can also be created for testing.  To use,
   // create an DisableForTest object, and then create the new
   // NetworkChangeNotifier object.  The NetworkChangeNotifier must be
   // destroyed before the DisableForTest object, as its destruction will restore
   // the original NetworkChangeNotifier.
   class NET_EXPORT_PRIVATE DisableForTest {
@@ skipping 18 matching lines @@
 
   // A little-piggy-back observer that simply logs UMA histogram data.
   scoped_ptr<HistogramWatcher> histogram_watcher_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifier);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_NETWORK_CHANGE_NOTIFIER_H_