commit 576c979bfaea8cd3dc5cdaee5ec4a9882ee73996
author Alex Vakulenko <avakulenko@chromium.org> Mon Sep 22 16:49:45 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Sep 25 04:09:38 2014 +0000
tree 202307905cb36d1de85ef85a962dc4d4b1862193
parent 07216fe6005df7ab402426485f2823905c6a19d7

libchromeos: Move Dictionary class into its own header file

Moved chromeos::dbus_utils::Dictionary type alias into its
own header file (chromeos/dictionary.h) and promoting it to the
top level namespace (chromeos).

So now it becomes chromeos::VariantDictionary and it is now
independent from D-Bus data serialization.

BUG=None
TEST=FEATURE=test emerge-link libchromeos buffet

Change-Id: Ibad63fd4168d77b9a4b80c7800016510f87ae33d
Reviewed-on: https://chromium-review.googlesource.com/219413
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>

buffet/states/state_package_unittest.cc

diff --git a/buffet/states/state_package_unittest.cc b/buffet/states/state_package_unittest.cc
index a9caf09..d8dc907 100644
--- a/buffet/states/state_package_unittest.cc
+++ b/buffet/states/state_package_unittest.cc
@@ -6,7 +6,7 @@
 #include <string>
 
 #include <base/values.h>
-#include <chromeos/dbus/data_serialization.h>
+#include <chromeos/variant_dictionary.h>
 #include <gtest/gtest.h>
 
 #include "buffet/commands/schema_constants.h"
@@ -176,7 +176,7 @@
   EXPECT_EQ(200, value.TryGet<int>());
 
   value = package_->GetPropertyValue("direction", nullptr);
-  auto direction = value.TryGet<chromeos::dbus_utils::Dictionary>();
+  auto direction = value.TryGet<chromeos::VariantDictionary>();
   ASSERT_FALSE(direction.empty());
   EXPECT_DOUBLE_EQ(89.9, direction["altitude"].TryGet<double>());
   EXPECT_DOUBLE_EQ(57.2957795, direction["azimuth"].TryGet<double>());
@@ -208,7 +208,7 @@
 }
 
 TEST_F(StatePackageTest, SetPropertyValue_Object) {
-  chromeos::dbus_utils::Dictionary direction{
+  chromeos::VariantDictionary direction{
     {"altitude", double{45.0}},
     {"azimuth", double{15.0}},
   };
@@ -245,7 +245,7 @@
 
 TEST_F(StatePackageTest, SetPropertyValue_Error_Object_TypeMismatch) {
   chromeos::ErrorPtr error;
-  chromeos::dbus_utils::Dictionary direction{
+  chromeos::VariantDictionary direction{
     {"altitude", double{45.0}},
     {"azimuth", int{15}},
   };
@@ -261,7 +261,7 @@
 
 TEST_F(StatePackageTest, SetPropertyValue_Error_Object_OutOfRange) {
   chromeos::ErrorPtr error;
-  chromeos::dbus_utils::Dictionary direction{
+  chromeos::VariantDictionary direction{
     {"altitude", double{100.0}},
     {"azimuth", double{290.0}},
   };
@@ -278,7 +278,7 @@
 
 TEST_F(StatePackageTest, SetPropertyValue_Error_Object_UnknownProperty) {
   chromeos::ErrorPtr error;
-  chromeos::dbus_utils::Dictionary direction{
+  chromeos::VariantDictionary direction{
     {"altitude", double{10.0}},
     {"azimuth", double{20.0}},
     {"spin", double{30.0}},
@@ -291,7 +291,7 @@
 
 TEST_F(StatePackageTest, SetPropertyValue_Error_Object_MissingProperty) {
   chromeos::ErrorPtr error;
-  chromeos::dbus_utils::Dictionary direction{
+  chromeos::VariantDictionary direction{
     {"altitude", double{10.0}},
   };
   ASSERT_FALSE(package_->SetPropertyValue("direction", direction, &error));