Add native-side unit test for Android NetworkChangeNotifier

content/shell/shell_browser_main_parts.cc

 // 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.
 
 #include "content/shell/shell_browser_main_parts.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "content/public/common/url_constants.h"
 #include "content/shell/shell.h"
 #include "content/shell/shell_browser_context.h"
 #include "content/shell/shell_devtools_delegate.h"
 #include "content/shell/shell_switches.h"
 #include "googleurl/src/gurl.h"
 #include "grit/net_resources.h"
 #include "net/base/net_module.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_ANDROID)
 #include "net/base/network_change_notifier.h"
-#include "net/android/network_change_notifier_factory.h"
+#include "net/android/network_change_notifier_factory_android.h"
 #endif
 
 namespace content {
 
 namespace {
 
 static GURL GetStartupURL() {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kContentBrowserTest))
     return GURL();
@@ skipping 40 matching lines @@
 
 void ShellBrowserMainParts::PostMainMessageLoopStart() {
 #if defined(OS_ANDROID)
   MessageLoopForUI::current()->Start();
 #endif
 }
 
 void ShellBrowserMainParts::PreEarlyInitialization() {
 #if defined(OS_ANDROID)
   net::NetworkChangeNotifier::SetFactory(
-      new net::android::NetworkChangeNotifierFactory());
+      new net::NetworkChangeNotifierFactoryAndroid());

[jochen (gone - plz use gerrit), 2012/09/18 13:25:43]

why is this needed?

ShellBrowserMainPartsAndroid already sets it, no?

[gone, 2012/09/18 17:05:46]

AFAICT, there is no ShellBrowserMainPartsAndroid in the tree.

[jochen (gone - plz use gerrit), 2012/09/18 19:21:05]

Argh, I misread ChromeBrowserMainPartsAndroid as Shell... sorry

 #endif
 }
 
 void ShellBrowserMainParts::PreMainMessageLoopRun() {
   browser_context_.reset(new ShellBrowserContext(false));
   off_the_record_browser_context_.reset(new ShellBrowserContext(true));
 
   Shell::PlatformInitialize();
   net::NetModule::SetResourceProvider(PlatformResourceProvider);
 
@@ skipping 41 matching lines @@
 #if defined(USE_AURA)
   Shell::PlatformExit();
 #endif
   if (devtools_delegate_)
     devtools_delegate_->Stop();
   browser_context_.reset();
   off_the_record_browser_context_.reset();
 }
 
 }  // namespace