Add string16 and name/title support to aura::PropertyConverter.

ui/aura/mus/property_converter_unittest.cc

 // Copyright 2016 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 "ui/aura/mus/property_converter.h"
 
 #include <stdint.h>
 #include <string>
 
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/strings/utf_string_conversions.h"
 #include "services/ui/public/cpp/property_type_converters.h"
+#include "ui/aura/client/aura_constants.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_property.h"
 #include "ui/gfx/geometry/rect.h"
 
-// See aura_constants.cc for bool, int32_t, int64_t, std::string, and gfx::Rect.
-// That same file also declares the uint32_t type via SkColor.
+// See aura_constants.cc for bool, int32_t, int64_t, std::string, gfx::Rect,
+// and base::string16. It also declares the uint32_t type via SkColor.
 DECLARE_WINDOW_PROPERTY_TYPE(uint8_t)
 DECLARE_WINDOW_PROPERTY_TYPE(uint16_t)
 DECLARE_WINDOW_PROPERTY_TYPE(uint64_t)
 DECLARE_WINDOW_PROPERTY_TYPE(int8_t)
 DECLARE_WINDOW_PROPERTY_TYPE(int16_t)
 
 namespace aura {
 
 namespace {
 
 DEFINE_WINDOW_PROPERTY_KEY(bool, kTestPropertyKey0, false);
 DEFINE_WINDOW_PROPERTY_KEY(uint8_t, kTestPropertyKey1, 0);
 DEFINE_WINDOW_PROPERTY_KEY(uint16_t, kTestPropertyKey2, 0);
 DEFINE_WINDOW_PROPERTY_KEY(uint32_t, kTestPropertyKey3, 0);
 DEFINE_WINDOW_PROPERTY_KEY(uint64_t, kTestPropertyKey4, 0);
 DEFINE_WINDOW_PROPERTY_KEY(int8_t, kTestPropertyKey5, 0);
 DEFINE_WINDOW_PROPERTY_KEY(int16_t, kTestPropertyKey6, 0);
 DEFINE_WINDOW_PROPERTY_KEY(int32_t, kTestPropertyKey7, 0);
 DEFINE_WINDOW_PROPERTY_KEY(int64_t, kTestPropertyKey8, 0);
 
 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kTestRectPropertyKey, nullptr);
 DEFINE_OWNED_WINDOW_PROPERTY_KEY(std::string, kTestStringPropertyKey, nullptr);
+DEFINE_OWNED_WINDOW_PROPERTY_KEY(base::string16, kTestString16PropertyKey,
+                                 nullptr);
 
 const char kTestPropertyServerKey0[] = "test-property-server0";
 const char kTestPropertyServerKey1[] = "test-property-server1";
 const char kTestPropertyServerKey2[] = "test-property-server2";
 const char kTestPropertyServerKey3[] = "test-property-server3";
 const char kTestPropertyServerKey4[] = "test-property-server4";
 const char kTestPropertyServerKey5[] = "test-property-server5";
 const char kTestPropertyServerKey6[] = "test-property-server6";
 const char kTestPropertyServerKey7[] = "test-property-server7";
 const char kTestPropertyServerKey8[] = "test-property-server8";
 
 const char kTestRectPropertyServerKey[] = "test-rect-property-server";
 const char kTestStringPropertyServerKey[] = "test-string-property-server";
+const char kTestString16PropertyServerKey[] = "test-string16-property-server";
 
 // Test registration, naming and value conversion for primitive property types.
 template <typename T>
 void TestPrimitiveProperty(PropertyConverter* property_converter,
                            Window* window,
                            const WindowProperty<T>* key,
                            const char* transport_name,
                            T value_1,
                            T value_2) {
   property_converter->RegisterProperty(key, transport_name);
@@ skipping 122 matching lines @@
             *transport_value_out.get());
 
   std::string value_2 = "another test value";
   std::vector<uint8_t> transport_value =
       mojo::ConvertTo<std::vector<uint8_t>>(value_2);
   property_converter.SetPropertyFromTransportValue(
       window.get(), kTestStringPropertyServerKey, &transport_value);
   EXPECT_EQ(value_2, *window->GetProperty(kTestStringPropertyKey));
 }
 
+// Verifies property setting behavior for a base::string16* property.
+TEST_F(PropertyConverterTest, String16Property) {
+  PropertyConverter property_converter;
+  property_converter.RegisterProperty(kTestString16PropertyKey,
+                                      kTestString16PropertyServerKey);
+  EXPECT_EQ(kTestString16PropertyServerKey,
+            property_converter.GetTransportNameForPropertyKey(
+                kTestString16PropertyKey));
+
+  base::string16 value_1 = base::ASCIIToUTF16("test value");
+  std::unique_ptr<Window> window(CreateNormalWindow(1, root_window(), nullptr));
+  window->SetProperty(kTestString16PropertyKey, new base::string16(value_1));
+  EXPECT_EQ(value_1, *window->GetProperty(kTestString16PropertyKey));
+
+  std::string transport_name_out;
+  std::unique_ptr<std::vector<uint8_t>> transport_value_out;
+  EXPECT_TRUE(property_converter.ConvertPropertyForTransport(
+      window.get(), kTestString16PropertyKey, &transport_name_out,
+      &transport_value_out));
+  EXPECT_EQ(kTestString16PropertyServerKey, transport_name_out);
+  EXPECT_EQ(mojo::ConvertTo<std::vector<uint8_t>>(value_1),
+            *transport_value_out.get());
+
+  base::string16 value_2 = base::ASCIIToUTF16("another test value");
+  std::vector<uint8_t> transport_value =
+      mojo::ConvertTo<std::vector<uint8_t>>(value_2);
+  property_converter.SetPropertyFromTransportValue(
+      window.get(), kTestString16PropertyServerKey, &transport_value);
+  EXPECT_EQ(value_2, *window->GetProperty(kTestString16PropertyKey));
+}
+
 }  // namespace aura