[ash-md] Adds support for Z-order iteration in views::View

chromeos/dbus/fake_shill_manager_client.cc

Index: chromeos/dbus/fake_shill_manager_client.cc
diff --git a/chromeos/dbus/fake_shill_manager_client.cc b/chromeos/dbus/fake_shill_manager_client.cc
index 2f22a461b1e3586e25cccbcdddc4e8ef462635e9..9473599dbb99a6ac75aa639a27310ee97bfc7065 100644
--- a/chromeos/dbus/fake_shill_manager_client.cc
+++ b/chromeos/dbus/fake_shill_manager_client.cc
@@ -38,7 +38,7 @@ namespace {
 
 // Allow parsed command line option 'tdls_busy' to set the fake busy count.
 int s_tdls_busy_count = 0;
-int s_extra_wifi_networks = 0;
+int s_extra_wifi_networks = 20;
 
 // For testing dynamic WEP networks (uses wifi2).
 bool s_dynamic_wep = false;
@@ -917,6 +917,41 @@ void FakeShillManagerClient::SetupDefaultEnvironment() {
                          add_to_visible);
     services->SetServiceProperty(
         "/service/vpn2", shill::kProviderProperty, provider_properties_l2tp);
+
+    services->AddService("/service/vpn3", "vpn3_guid", "vpn3" /* name */,
+                         shill::kTypeVPN, shill::kStateIdle, add_to_visible);
+    services->SetServiceProperty("/service/vpn3", shill::kProviderProperty,
+                                 provider_properties_l2tp);
+
+    services->AddService("/service/vpn4", "vpn4_guid", "vpn4" /* name */,
+                         shill::kTypeVPN, shill::kStateIdle, add_to_visible);
+    services->SetServiceProperty("/service/vpn4", shill::kProviderProperty,
+                                 provider_properties_l2tp);
+
+    services->AddService("/service/vpn5", "vpn5_guid", "vpn5" /* name */,
+                         shill::kTypeVPN, shill::kStateIdle, add_to_visible);
+    services->SetServiceProperty("/service/vpn5", shill::kProviderProperty,
+                                 provider_properties_l2tp);
+
+    services->AddService("/service/vpn6", "vpn6_guid", "vpn6" /* name */,
+                         shill::kTypeVPN, shill::kStateIdle, add_to_visible);
+    services->SetServiceProperty("/service/vpn6", shill::kProviderProperty,
+                                 provider_properties_l2tp);
+
+    services->AddService("/service/vpn7", "vpn7_guid", "vpn7" /* name */,
+                         shill::kTypeVPN, shill::kStateIdle, add_to_visible);
+    services->SetServiceProperty("/service/vpn7", shill::kProviderProperty,
+                                 provider_properties_l2tp);
+
+    services->AddService("/service/vpn8", "vpn8_guid", "vpn8" /* name */,
+                         shill::kTypeVPN, shill::kStateIdle, add_to_visible);
+    services->SetServiceProperty("/service/vpn8", shill::kProviderProperty,
+                                 provider_properties_l2tp);
+
+    services->AddService("/service/vpn9", "vpn9_guid", "vpn9" /* name */,
+                         shill::kTypeVPN, shill::kStateIdle, add_to_visible);
+    services->SetServiceProperty("/service/vpn9", shill::kProviderProperty,
+                                 provider_properties_l2tp);
   }
 
   // Additional device states