[Chrome OS] Make PrerenderConditionNetwork use NetworkStateHandler

chrome/browser/chromeos/prerender_condition_network.cc

Index: chrome/browser/chromeos/prerender_condition_network.cc
diff --git a/chrome/browser/chromeos/prerender_condition_network.cc b/chrome/browser/chromeos/prerender_condition_network.cc
index f7519a16a4aa91a62609a1532946b7426e4861ad..0948c35f91c97fad7437b48d6b4fb76a05e49bc0 100644
--- a/chrome/browser/chromeos/prerender_condition_network.cc
+++ b/chrome/browser/chromeos/prerender_condition_network.cc
@@ -4,27 +4,27 @@
 
 #include "chrome/browser/chromeos/prerender_condition_network.h"
 
+#include "chromeos/network/network_state.h"
+#include "chromeos/network/network_state_handler.h"
+#include "third_party/cros_system_api/dbus/service_constants.h"
+
 namespace chromeos {
 
-PrerenderConditionNetwork::PrerenderConditionNetwork(
-    NetworkLibrary* network_library) : network_library_(network_library) {
-  DCHECK(network_library_);
+PrerenderConditionNetwork::PrerenderConditionNetwork() {
 }
 
 PrerenderConditionNetwork::~PrerenderConditionNetwork() {
 }
 
 bool PrerenderConditionNetwork::CanPrerender() const {
-  const Network* active_network = network_library_->active_network();
-  if (!active_network)
+  const NetworkState* default_network =
+      NetworkHandler::Get()->network_state_handler()->DefaultNetwork();

[cbentzel, 2013/06/03 16:51:16]

Is there a difference between active network (old behavior) and default network?

[stevenjb, 2013/06/03 17:14:54]

Yes, actually.

We renamed "Active" to "Default" because there can be more than one "active"
connection (e.g. Ethernet and Wifi), and defined "Default" to refer to the
default/primary connected network. Also in the old code active_network() could
include a VPN, or a connecting network, which means the old code was actually
incorrect (a common bug in fact and another motivation to changing the API).

This code should actually do the correct thing: return true if the default
connected network is Ethernet or Wifi.

[gauravsh, 2013/06/03 17:20:49]

No, Default is the same as Active - we use default now to match Shill
terminology.

+  if (!default_network)
     return false;
-  switch (active_network->type()) {
-    case TYPE_ETHERNET:
-    case TYPE_WIFI:
-      return true;
-    default:
-      return false;
-  }
+  const std::string& type = default_network->type();
+  if (type == flimflam::kTypeEthernet || type == flimflam::kTypeWifi)
+    return true;
+  return false;
 }
 
 }  // namespace chromeos