Make necessary changes for chromecast build as chromecast has it own implementation of NetworkChang…

net/base/network_change_notifier.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 "net/base/network_change_notifier.h"
 
 #include "base/metrics/histogram.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
 #include "build/build_config.h"
 #include "net/base/net_util.h"
 #include "net/base/network_change_notifier_factory.h"
 #include "net/dns/dns_config_service.h"
 #include "net/url_request/url_request.h"
 #include "url/gurl.h"
 
 #if defined(OS_WIN)
 #include "net/base/network_change_notifier_win.h"
-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(CHROMECAST_BUILD)

[darin (slow to review), 2014/04/14 05:03:29]

is it actually problematic to include this header?

[lcwu1, 2014/04/15 06:24:42]

No, it doesn't cause any problem if we include the linux version. I will remove
the defined here.

 #include "net/base/network_change_notifier_linux.h"
 #elif defined(OS_MACOSX)
 #include "net/base/network_change_notifier_mac.h"
 #endif
 
 namespace net {
 
 namespace {
 
 // The actual singleton notifier.  The class contract forbids usage of the API
@@ skipping 443 matching lines @@
     NetworkChangeNotifierFactory* factory) {
   CHECK(!g_network_change_notifier_factory);
   g_network_change_notifier_factory = factory;
 }
 
 // static
 NetworkChangeNotifier* NetworkChangeNotifier::Create() {
   if (g_network_change_notifier_factory)
     return g_network_change_notifier_factory->CreateInstance();
 
 #if defined(OS_WIN)

[darin (slow to review), 2014/04/14 05:03:29]

we could eliminate #ifdefs here by having separate .cc files for each
configuration. then we could just select the proper one at link time via GYP
instead of at preprocessor time here.

[lcwu1, 2014/04/15 06:24:42]

Sure, let me try to re-factor the code to do that.

   NetworkChangeNotifierWin* network_change_notifier =
       new NetworkChangeNotifierWin();
   network_change_notifier->WatchForAddressChange();
   return network_change_notifier;
 #elif defined(OS_CHROMEOS) || defined(OS_ANDROID)
-  // ChromeOS and Android builds MUST use their own class factory.
+  // ChromeOS, Android, and Chromecast builds MUST use their own class factory.

[Ryan Sleevi, 2014/04/14 21:28:43]

This comment doesn't seem like it should be updated - you're not handling this
on line 488-496, but below.

[lcwu1, 2014/04/15 06:24:42]

Yes, this comment only makes sense in patch set 2. I forgot to change it after
creating patch set 3. I will modify it if refactoring the code to remove #ifdefs
proves to be much more difficult.

 #if !defined(OS_CHROMEOS)
   // TODO(oshima): ash_shell do not have access to chromeos'es
   // notifier yet. Re-enable this when chromeos'es notifier moved to
   // chromeos root directory. crbug.com/119298.
   CHECK(false);
 #endif
   return NULL;
+#elif defined(CHROMECAST_BUILD)

[darin (slow to review), 2014/04/14 04:48:00]

The comment that Chromecast MUST use its own class factory seems to suggest that
there should also be a CHECK(false) in the CHROMECAST_BUILD case, no?

[Ryan Sleevi, 2014/04/14 21:28:43]

Apologies that I wasn't clearer, this is what I was trying to suggest earlier
with my first review comments - that is, if this is something that shouldn't be
called/reached, that you actively assert (eg: CHECK) to make sure it's not hit.

[lcwu1, 2014/04/15 06:24:42]

Yes, agreed. The reason why I didn't have a CHECK here is because we have not
hooked up our NetworkChangeNotifier[Factory] implementation yet (as we are doing
staged CL submission). So having a CHECK here will always fire. I will hook up a
stub implementation first and add back the CHECK.

+  return NULL;
 #elif defined(OS_LINUX)
   return NetworkChangeNotifierLinux::Create();
 #elif defined(OS_MACOSX)
   return new NetworkChangeNotifierMac();
 #else
   NOTIMPLEMENTED();
   return NULL;
 #endif
 }
 
@@ skipping 235 matching lines @@
   DCHECK(g_network_change_notifier);
   g_network_change_notifier = NULL;
 }
 
 NetworkChangeNotifier::DisableForTest::~DisableForTest() {
   DCHECK(!g_network_change_notifier);
   g_network_change_notifier = network_change_notifier_;
 }
 
 }  // namespace net