Introduce RootWindowProperty for RootWindow's properties

ash/wm/frame_painter_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 "ash/wm/frame_painter.h"
 
 #include "ash/ash_constants.h"
+#include "ash/root_window_property.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/property_util.h"
-#include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/frame_caption_button_container_view.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "grit/ash_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/hit_test.h"
@@ skipping 186 matching lines @@
   // Ensure that creating/deleting a window works well and doesn't cause
   // crashes.  See crbug.com/155634
   aura::RootWindow* root = Shell::GetActiveRootWindow();
 
   scoped_ptr<Widget> widget(CreateTestWidget());
   scoped_ptr<FramePainter> painter(CreateTestPainter(widget.get()));
   widget->Show();
 
   // We only have one window, so it should use a solo header.
   EXPECT_TRUE(painter->UseSoloWindowHeader());
-  EXPECT_TRUE(root->GetProperty(internal::kSoloWindowHeaderKey));
+  EXPECT_TRUE(internal::GetRootWindowProperty(root)->solo_window_header);
 
   // Close the window.
   widget.reset();
-  EXPECT_FALSE(root->GetProperty(internal::kSoloWindowHeaderKey));
+  EXPECT_FALSE(internal::GetRootWindowProperty(root)->solo_window_header);
 
   // Recreate another window again.
   widget.reset(CreateTestWidget());
   painter.reset(CreateTestPainter(widget.get()));
   widget->Show();
   EXPECT_TRUE(painter->UseSoloWindowHeader());
-  EXPECT_TRUE(root->GetProperty(internal::kSoloWindowHeaderKey));
+  EXPECT_TRUE(internal::GetRootWindowProperty(root)->solo_window_header);
 }
 
 TEST_F(FramePainterTest, UseSoloWindowHeader) {
   // Create a widget and a painter for it.
   scoped_ptr<Widget> w1(CreateTestWidget());
   scoped_ptr<FramePainter> p1(CreateTestPainter(w1.get()));
   w1->Show();
 
   // We only have one window, so it should use a solo header.
   EXPECT_TRUE(p1->UseSoloWindowHeader());
@@ skipping 413 matching lines @@
   FramePainterOwner* o2 = new FramePainterOwner(w2);
   FramePainter* p2 = o2->frame_painter();
   w2->Show();
   EXPECT_FALSE(p1->UseSoloWindowHeader());
   EXPECT_FALSE(p2->UseSoloWindowHeader());
 
   // Exit with no resource release. They'll be released at shutdown.
 }
 
 }  // namespace ash