Add migration from CaCert NSS nicknames to PEM.

chromeos/dbus/shill_service_client_stub.cc

 // Copyright (c) 2013 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 "chromeos/dbus/shill_service_client_stub.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 348 matching lines @@
     // the list in the manager client.
     // TODO(gauravsh): Generalize to sort services properly to allow for testing
     //  more complex scenarios.
     std::string state;
     if (value.GetAsString(&state) && (state == flimflam::kStateOnline ||
                                       state == flimflam::kStatePortal))  {
       DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
           MoveServiceToIndex(service_path, 0, true);
     }
   }
-  dict->SetWithoutPathExpansion(property, value.DeepCopy());
+  base::DictionaryValue new_properties;
+  std::string changed_property;
+  if (property == flimflam::kOpenVPNCaCertNSSProperty ||
+      property == flimflam::kOpenVPNCaCertNSSProperty) {

[stevenjb, 2013/07/29 17:53:03]

Same property twice? I assume one should be kL2tpIpsecCaCertNssProperty. We
should probably at least handler 'kProvider[Host|Type|Name]Property' here also.
Would it be correct to handle all of 'L2TPIPSec.*' and 'OpenVPN.*' this way?

[pneubeck (no reviews), 2013/08/05 08:51:22]

Done.

+    // These properties are only nested within the Provider dictionary if read
+    // from Shill.
+    base::DictionaryValue* provider = new base::DictionaryValue;
+    provider->SetWithoutPathExpansion(property, value.DeepCopy());
+    new_properties.SetWithoutPathExpansion(flimflam::kProviderProperty,
+                                           provider);
+    changed_property = flimflam::kProviderProperty;
+  } else {
+    new_properties.SetWithoutPathExpansion(property, value.DeepCopy());
+    changed_property = property;
+  }
+
+  dict->MergeDictionary(&new_properties);
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&ShillServiceClientStub::NotifyObserversPropertyChanged,
                  weak_ptr_factory_.GetWeakPtr(),
-                 dbus::ObjectPath(service_path), property));
+                 dbus::ObjectPath(service_path), changed_property));
   return true;
 }
 
 const base::DictionaryValue* ShillServiceClientStub::GetServiceProperties(
     const std::string& service_path) const {
   const base::DictionaryValue* properties = NULL;
   stub_services_.GetDictionaryWithoutPathExpansion(service_path, &properties);
   return properties;
 }
 
@@ skipping 98 matching lines @@
   std::map<dbus::ObjectPath, PropertyObserverList*>::iterator iter =
       observer_list_.find(device_path);
   if (iter != observer_list_.end())
     return *(iter->second);
   PropertyObserverList* observer_list = new PropertyObserverList();
   observer_list_[device_path] = observer_list;
   return *observer_list;
 }
 
 }  // namespace chromeos