Elim 'Translated' from Managed ONC dictionary

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 7b4eb61f39c3f515d2c7cdb962a0c5ec2d86b00b..0da7c31e22e432486b765c31ebf702563c02679e 100644
--- a/chromeos/dbus/fake_shill_manager_client.cc
+++ b/chromeos/dbus/fake_shill_manager_client.cc
@@ -778,29 +778,36 @@ void FakeShillManagerClient::SetupDefaultEnvironment() {
     // Shill, "Provider.Type", etc keys are used, but when reading the values
     // "Provider" . "Type", etc keys are used. Here we are setting the values
     // that will be read (by the UI, tests, etc).
-    base::DictionaryValue provider_properties;
-    provider_properties.SetString(shill::kTypeProperty,
-                                  shill::kProviderOpenVpn);
-    provider_properties.SetString(shill::kHostProperty, "vpn_host");
-
-    services->AddService("/service/vpn1",
-                         "vpn1_guid",
-                         "vpn1" /* name */,
-                         shill::kTypeVPN,
-                         state,
-                         add_to_visible);
-    services->SetServiceProperty(
-        "/service/vpn1", shill::kProviderProperty, provider_properties);
-    profiles->AddService(shared_profile, "/service/vpn1");
-
-    services->AddService("/service/vpn2",
-                         "vpn2_guid",
-                         "vpn2" /* name */,
-                         shill::kTypeVPN,
-                         shill::kStateIdle,
-                         add_to_visible);
-    services->SetServiceProperty(
-        "/service/vpn2", shill::kProviderProperty, provider_properties);
+    {
+      base::DictionaryValue provider_properties;
+      provider_properties.SetString(shill::kTypeProperty,
+                                    shill::kProviderOpenVpn);
+      provider_properties.SetString(shill::kHostProperty, "vpn_host");
+
+      services->AddService("/service/vpn1",
+                           "vpn1_guid",
+                           "vpn1" /* name */,
+                           shill::kTypeVPN,
+                           state,
+                           add_to_visible);
+      services->SetServiceProperty(
+          "/service/vpn1", shill::kProviderProperty, provider_properties);
+      profiles->AddService(shared_profile, "/service/vpn1");
+    }
+    {
+      base::DictionaryValue provider_properties2;
+      provider_properties2.SetString(shill::kTypeProperty,
+                                     shill::kProviderL2tpIpsec);
+      provider_properties2.SetString(shill::kHostProperty, "vpn_host2");

[armansito, 2014/09/03 21:42:02]

nit: Add an empty line here for consistency with the previous block.

[stevenjb, 2014/09/04 15:34:11]

Done.

+      services->AddService("/service/vpn2",
+                           "vpn2_guid",
+                           "vpn2" /* name */,
+                           shill::kTypeVPN,
+                           shill::kStateIdle,
+                           add_to_visible);
+      services->SetServiceProperty(
+          "/service/vpn2", shill::kProviderProperty, provider_properties2);
+    }

[armansito, 2014/09/03 21:42:03]

nit: You already declared |provider_properties| and |provider_properties2|; are
the nested scopes necessary?

[stevenjb, 2014/09/04 15:34:11]

It's far too easily to accidentally use 'provider_properties' instead of
'provider_properties2'. I guess I could name them better and remove the scoping.
Done.

   }
 
   // Additional device states