| Index: ui/aura/mus/property_converter_unittest.cc
|
| diff --git a/ui/aura/mus/property_converter_unittest.cc b/ui/aura/mus/property_converter_unittest.cc
|
| index c5c28ed0ee1bd42846f8e8ad5bcb0c91c598f334..98c1d977fbad779e8a9101c0f47205b0b7dc68ca 100644
|
| --- a/ui/aura/mus/property_converter_unittest.cc
|
| +++ b/ui/aura/mus/property_converter_unittest.cc
|
| @@ -77,7 +77,7 @@ void TestPrimitiveProperty(PropertyConverter* property_converter,
|
| const char* transport_name,
|
| T value_1,
|
| T value_2) {
|
| - property_converter->RegisterProperty(
|
| + property_converter->RegisterPrimitiveProperty(
|
| key, transport_name, PropertyConverter::CreateAcceptAnyValueCallback());
|
| EXPECT_EQ(transport_name,
|
| property_converter->GetTransportNameForPropertyKey(key));
|
| @@ -174,9 +174,9 @@ TEST_F(PropertyConverterTest, TestPrimitiveVerifier) {
|
| std::unique_ptr<Window> window(CreateNormalWindow(1, root_window(), nullptr));
|
|
|
| PropertyConverter property_converter;
|
| - property_converter.RegisterProperty(kTestPropertyKey8,
|
| - kTestPropertyServerKey8,
|
| - base::Bind(&OnlyAllowNegativeNumbers));
|
| + property_converter.RegisterPrimitiveProperty(
|
| + kTestPropertyKey8, kTestPropertyServerKey8,
|
| + base::Bind(&OnlyAllowNegativeNumbers));
|
|
|
| // Test that we reject invalid TransportValues during
|
| // GetPropertyValueFromTransportValue().
|
| @@ -197,8 +197,8 @@ TEST_F(PropertyConverterTest, TestPrimitiveVerifier) {
|
| // Verifies property setting behavior for a gfx::ImageSkia* property.
|
| TEST_F(PropertyConverterTest, ImageSkiaProperty) {
|
| PropertyConverter property_converter;
|
| - property_converter.RegisterProperty(kTestImagePropertyKey,
|
| - kTestImagePropertyServerKey);
|
| + property_converter.RegisterImageProperty(kTestImagePropertyKey,
|
| + kTestImagePropertyServerKey);
|
| EXPECT_EQ(
|
| kTestImagePropertyServerKey,
|
| property_converter.GetTransportNameForPropertyKey(kTestImagePropertyKey));
|
| @@ -239,8 +239,8 @@ TEST_F(PropertyConverterTest, ImageSkiaProperty) {
|
| // Verifies property setting behavior for a gfx::Rect* property.
|
| TEST_F(PropertyConverterTest, RectProperty) {
|
| PropertyConverter property_converter;
|
| - property_converter.RegisterProperty(kTestRectPropertyKey,
|
| - kTestRectPropertyServerKey);
|
| + property_converter.RegisterRectProperty(kTestRectPropertyKey,
|
| + kTestRectPropertyServerKey);
|
| EXPECT_EQ(
|
| kTestRectPropertyServerKey,
|
| property_converter.GetTransportNameForPropertyKey(kTestRectPropertyKey));
|
| @@ -272,8 +272,8 @@ TEST_F(PropertyConverterTest, RectProperty) {
|
| // Verifies property setting behavior for a gfx::Size* property.
|
| TEST_F(PropertyConverterTest, SizeProperty) {
|
| PropertyConverter property_converter;
|
| - property_converter.RegisterProperty(kTestSizePropertyKey,
|
| - kTestSizePropertyServerKey);
|
| + property_converter.RegisterSizeProperty(kTestSizePropertyKey,
|
| + kTestSizePropertyServerKey);
|
| EXPECT_EQ(
|
| kTestSizePropertyServerKey,
|
| property_converter.GetTransportNameForPropertyKey(kTestSizePropertyKey));
|
| @@ -305,8 +305,8 @@ TEST_F(PropertyConverterTest, SizeProperty) {
|
| // Verifies property setting behavior for a std::string* property.
|
| TEST_F(PropertyConverterTest, StringProperty) {
|
| PropertyConverter property_converter;
|
| - property_converter.RegisterProperty(kTestStringPropertyKey,
|
| - kTestStringPropertyServerKey);
|
| + property_converter.RegisterStringProperty(kTestStringPropertyKey,
|
| + kTestStringPropertyServerKey);
|
| EXPECT_EQ(kTestStringPropertyServerKey,
|
| property_converter.GetTransportNameForPropertyKey(
|
| kTestStringPropertyKey));
|
| @@ -338,8 +338,8 @@ TEST_F(PropertyConverterTest, StringProperty) {
|
| // Verifies property setting behavior for a base::string16* property.
|
| TEST_F(PropertyConverterTest, String16Property) {
|
| PropertyConverter property_converter;
|
| - property_converter.RegisterProperty(kTestString16PropertyKey,
|
| - kTestString16PropertyServerKey);
|
| + property_converter.RegisterString16Property(kTestString16PropertyKey,
|
| + kTestString16PropertyServerKey);
|
| EXPECT_EQ(kTestString16PropertyServerKey,
|
| property_converter.GetTransportNameForPropertyKey(
|
| kTestString16PropertyKey));
|
|
|