diff options
| author | dfalcantara@chromium.org <dfalcantara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-20 02:27:14 +0000 |
|---|---|---|
| committer | dfalcantara@chromium.org <dfalcantara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-20 02:27:14 +0000 |
| commit | ab3309da32a9436501b4837f9026d2a2eeae15f7 (patch) | |
| tree | afdb3b07b9878a3b74f1d135910cf1238bbf0065 /chrome/browser/chrome_browser_main_android.cc | |
| parent | b6f3769c7098ac010914b44040c1d7975bb919ac (diff) | |
| download | chromium_src-ab3309da32a9436501b4837f9026d2a2eeae15f7.zip chromium_src-ab3309da32a9436501b4837f9026d2a2eeae15f7.tar.gz chromium_src-ab3309da32a9436501b4837f9026d2a2eeae15f7.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/chrome_browser_main_android.cc')
| -rw-r--r-- | chrome/browser/chrome_browser_main_android.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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. |