Refactor and push window properties up to class properties.

ui/aura/window_unittest.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 "ui/aura/window.h"
 
 #include <limits.h>
 
 #include <string>
 #include <utility>
@@ skipping 12 matching lines @@
 #include "ui/aura/client/window_parenting_client.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/aura_test_utils.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/test/window_test_api.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_observer.h"
-#include "ui/aura/window_property.h"
 #include "ui/aura/window_tree_host.h"
+#include "ui/base/class_property.h"
 #include "ui/base/hit_test.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/compositor/test/test_layers.h"
 #include "ui/display/screen.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/gesture_detection/gesture_configuration.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/gfx/skia_util.h"
 
-DECLARE_WINDOW_PROPERTY_TYPE(const char*)
+DECLARE_UI_CLASS_PROPERTY_TYPE(const char*)
 
 namespace {
 
 enum class DeletionOrder {
   LAYOUT_MANAGER_FIRST,
   PROPERTY_FIRST,
   UNKNOWN,
 };
 
 class DeletionTracker {
@@ skipping 29 matching lines @@
  public:
   explicit DeletionTestProperty(DeletionTracker* tracker) : tracker_(tracker) {}
   ~DeletionTestProperty() { tracker_->PropertyDeleted(); }
 
  private:
   DeletionTracker* tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(DeletionTestProperty);
 };
 
-class TestProperty {
- public:
-  TestProperty() {}
-  ~TestProperty() {
-    last_deleted_ = this;
-  }
-  static TestProperty* last_deleted() { return last_deleted_; }
-
- private:
-  static TestProperty* last_deleted_;
-  DISALLOW_COPY_AND_ASSIGN(TestProperty);
-};
-
-TestProperty* TestProperty::last_deleted_ = nullptr;
-
-DEFINE_OWNED_WINDOW_PROPERTY_KEY(TestProperty, kOwnedKey, NULL);
-DEFINE_OWNED_WINDOW_PROPERTY_KEY(DeletionTestProperty,
-                                 kDeletionTestPropertyKey,
-                                 nullptr);
+DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(DeletionTestProperty,
+                                   kDeletionTestPropertyKey,
+                                   nullptr);
 
 }  // namespace
 
-DECLARE_WINDOW_PROPERTY_TYPE(TestProperty*);
-
-DECLARE_WINDOW_PROPERTY_TYPE(DeletionTestProperty*);
+DECLARE_UI_CLASS_PROPERTY_TYPE(DeletionTestProperty*);
 
 namespace aura {
 namespace test {
 
 class WindowTest : public AuraTestBaseWithType {
  public:
   WindowTest() : max_separation_(0) {
   }
 
   void SetUp() override {
@@ skipping 1512 matching lines @@
   transform.Translate(size.height(), 0.0);
   transform.Rotate(90.0);
   host()->SetRootTransform(transform);
 
   ui::TouchEvent press(
       ui::ET_TOUCH_PRESSED, gfx::Point(size.height() - 10, 10), 0, getTime());
   DispatchEventUsingWindowDispatcher(&press);
   EXPECT_EQ(gfx::Point(10, 10).ToString(), delegate->position().ToString());
 }
 
-namespace {
-DEFINE_WINDOW_PROPERTY_KEY(int, kIntKey, -2);
-DEFINE_WINDOW_PROPERTY_KEY(const char*, kStringKey, "squeamish");
-}
-
 TEST_P(WindowTest, Property) {
   std::unique_ptr<Window> w(CreateTestWindowWithId(0, root_window()));
 
   static const char native_prop_key[] = "fnord";
 
   // Non-existent properties should return the default values.
-  EXPECT_EQ(-2, w->GetProperty(kIntKey));
-  EXPECT_EQ(std::string("squeamish"), w->GetProperty(kStringKey));
-  EXPECT_EQ(NULL, w->GetNativeWindowProperty(native_prop_key));
-
-  // A set property value should be returned again (even if it's the default
-  // value).
-  w->SetProperty(kIntKey, INT_MAX);
-  EXPECT_EQ(INT_MAX, w->GetProperty(kIntKey));
-  w->SetProperty(kIntKey, -2);
-  EXPECT_EQ(-2, w->GetProperty(kIntKey));
-  w->SetProperty(kIntKey, INT_MIN);
-  EXPECT_EQ(INT_MIN, w->GetProperty(kIntKey));
-
-  w->SetProperty(kStringKey, static_cast<const char*>(NULL));
-  EXPECT_EQ(NULL, w->GetProperty(kStringKey));
-  w->SetProperty(kStringKey, "squeamish");
-  EXPECT_EQ(std::string("squeamish"), w->GetProperty(kStringKey));
-  w->SetProperty(kStringKey, "ossifrage");
-  EXPECT_EQ(std::string("ossifrage"), w->GetProperty(kStringKey));
+  EXPECT_EQ(nullptr, w->GetNativeWindowProperty(native_prop_key));
 
   w->SetNativeWindowProperty(native_prop_key, &*w);
   EXPECT_EQ(&*w, w->GetNativeWindowProperty(native_prop_key));
-  w->SetNativeWindowProperty(native_prop_key, NULL);
-  EXPECT_EQ(NULL, w->GetNativeWindowProperty(native_prop_key));
-
-  // ClearProperty should restore the default value.
-  w->ClearProperty(kIntKey);
-  EXPECT_EQ(-2, w->GetProperty(kIntKey));
-  w->ClearProperty(kStringKey);
-  EXPECT_EQ(std::string("squeamish"), w->GetProperty(kStringKey));
-}
-
-TEST_P(WindowTest, OwnedProperty) {
-  std::unique_ptr<Window> w(CreateTestWindowWithId(0, root_window()));
-  EXPECT_EQ(NULL, w->GetProperty(kOwnedKey));
-  TestProperty* last_deleted = TestProperty::last_deleted();
-  TestProperty* p1 = new TestProperty();
-  w->SetProperty(kOwnedKey, p1);
-  EXPECT_EQ(p1, w->GetProperty(kOwnedKey));
-  EXPECT_EQ(last_deleted, TestProperty::last_deleted());
-
-  TestProperty* p2 = new TestProperty();
-  w->SetProperty(kOwnedKey, p2);
-  EXPECT_EQ(p2, w->GetProperty(kOwnedKey));
-  EXPECT_EQ(p1, TestProperty::last_deleted());
-
-  w->ClearProperty(kOwnedKey);
-  EXPECT_EQ(NULL, w->GetProperty(kOwnedKey));
-  EXPECT_EQ(p2, TestProperty::last_deleted());
-
-  TestProperty* p3 = new TestProperty();
-  w->SetProperty(kOwnedKey, p3);
-  EXPECT_EQ(p3, w->GetProperty(kOwnedKey));
-  EXPECT_EQ(p2, TestProperty::last_deleted());
-  w.reset();
-  EXPECT_EQ(p3, TestProperty::last_deleted());
+  w->SetNativeWindowProperty(native_prop_key, nullptr);
+  EXPECT_EQ(nullptr, w->GetNativeWindowProperty(native_prop_key));
 }
 
 namespace {
 
 class DeletionTestLayoutManager : public LayoutManager {
  public:
   explicit DeletionTestLayoutManager(DeletionTracker* tracker)
       : tracker_(tracker) {}
   ~DeletionTestLayoutManager() override { tracker_->LayoutManagerDeleted(); }
 
@@ skipping 1252 matching lines @@
                         ::testing::Values(BackendType::CLASSIC,
                                           BackendType::MUS));
 
 INSTANTIATE_TEST_CASE_P(/* no prefix */,
                         WindowObserverTest,
                         ::testing::Values(BackendType::CLASSIC,
                                           BackendType::MUS));
 
 }  // namespace test
 }  // namespace aura