From ab3309da32a9436501b4837f9026d2a2eeae15f7 Mon Sep 17 00:00:00 2001 From: "dfalcantara@chromium.org" Date: Thu, 20 Sep 2012 02:27:14 +0000 Subject: Add native-side unit test for Android NetworkChangeNotifier * Renames some classes to move them out of the android namespace. * Changes singleton handling in the Java NetworkChangeNotifier. The singleton is unfortunately still required for Android to turn the AutoDetector on. * Adds a native-side unit test to track that the JNI calls are correctly plumbed to alert native-side observers of connection changes. BUG=136984 Review URL: https://chromiumcodereview.appspot.com/10928193 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157687 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/chrome_browser_main_android.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chrome/browser/chrome_browser_main_android.cc') diff --git a/chrome/browser/chrome_browser_main_android.cc b/chrome/browser/chrome_browser_main_android.cc index c9662fb..d99c140 100644 --- a/chrome/browser/chrome_browser_main_android.cc +++ b/chrome/browser/chrome_browser_main_android.cc @@ -6,7 +6,7 @@ #include "chrome/common/chrome_switches.h" #include "content/public/common/main_function_params.h" -#include "net/android/network_change_notifier_factory.h" +#include "net/android/network_change_notifier_factory_android.h" #include "net/base/network_change_notifier.h" ChromeBrowserMainPartsAndroid::ChromeBrowserMainPartsAndroid( @@ -19,7 +19,7 @@ ChromeBrowserMainPartsAndroid::~ChromeBrowserMainPartsAndroid() { void ChromeBrowserMainPartsAndroid::PreEarlyInitialization() { net::NetworkChangeNotifier::SetFactory( - new net::android::NetworkChangeNotifierFactory()); + new net::NetworkChangeNotifierFactoryAndroid()); // Chrome on Android does not use default MessageLoop. It has its own // Android specific MessageLoop. -- cgit v1.1