Fix dbus::PopDataAsValue's behavior when a dictionary's keys including dots

dbus/values_util.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 "dbus/values_util.h"
 
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
@@ skipping 39 matching lines @@
       scoped_ptr<Value> key(PopDataAsValue(&entry_reader));
       if (!key.get())
         return false;
       // Use JSONWriter to convert an arbitrary value to a string.
       base::JSONWriter::Write(key.get(), &key_string);
     }
     // Get the value and set the key-value pair.
     Value* value = PopDataAsValue(&entry_reader);
     if (!value)
       return false;
-    dictionary_value->Set(key_string, value);
+    dictionary_value->SetWithoutPathExpansion(key_string, value);

[satorux1, 2012/03/20 16:55:09]

Wow, that's subtle...

   }
   return true;
 }
 
 }  // namespace
 
 Value* PopDataAsValue(MessageReader* reader) {
   Value* result = NULL;
   switch (reader->GetDataType()) {
     case Message::INVALID_DATA:
@@ skipping 105 matching lines @@
       MessageReader sub_reader(NULL);
       if (reader->PopVariant(&sub_reader))
         result = PopDataAsValue(&sub_reader);
       break;
     }
   }
   return result;
 }
 
 }  // namespace dbus