views/mus: Set-up transient windows correctly.

components/mus/public/cpp/tests/window_unittest.cc

 // Copyright 2014 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 "components/mus/public/cpp/window.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "components/mus/common/util.h"
@@ skipping 105 matching lines @@
   w1.AddChild(&w11);
   EXPECT_TRUE(w11.visible());
   EXPECT_TRUE(w11.IsDrawn());
 
   w1.RemoveChild(&w11);
   EXPECT_TRUE(w11.visible());
   EXPECT_FALSE(w11.IsDrawn());
 }
 
 namespace {
-DEFINE_WINDOW_PROPERTY_KEY(int, kIntKey, -2);
-DEFINE_WINDOW_PROPERTY_KEY(const char*, kStringKey, "squeamish");
+MUS_DEFINE_WINDOW_PROPERTY_KEY(int, kIntKey, -2);
+MUS_DEFINE_WINDOW_PROPERTY_KEY(const char*, kStringKey, "squeamish");
 }
 
 TEST_F(WindowTest, Property) {
   TestWindow w;
 
   // Non-existent properties should return the default walues.
   EXPECT_EQ(-2, w.GetLocalProperty(kIntKey));
   EXPECT_EQ(std::string("squeamish"), w.GetLocalProperty(kStringKey));
 
   // A set property walue should be returned again (even if it's the default
@@ skipping 27 matching lines @@
   virtual ~TestProperty() { last_deleted_ = this; }
   static TestProperty* last_deleted() { return last_deleted_; }
 
  private:
   static TestProperty* last_deleted_;
   MOJO_DISALLOW_COPY_AND_ASSIGN(TestProperty);
 };
 
 TestProperty* TestProperty::last_deleted_ = NULL;
 
-DEFINE_OWNED_WINDOW_PROPERTY_KEY(TestProperty, kOwnedKey, NULL);
+MUS_DEFINE_OWNED_WINDOW_PROPERTY_KEY(TestProperty, kOwnedKey, NULL);
 
 }  // namespace
 
 TEST_F(WindowTest, OwnedProperty) {
   TestProperty* p3 = NULL;
   {
     TestWindow w;
     EXPECT_EQ(NULL, w.GetLocalProperty(kOwnedKey));
     TestProperty* p1 = new TestProperty();
     w.SetLocalProperty(kOwnedKey, p1);
@@ skipping 927 matching lines @@
   scoped_ptr<TestWindow> window0(CreateTestWindow(1, parent.get()));
   scoped_ptr<TestWindow> window1(CreateTestWindow(2, parent.get()));
 
   TestWindow* window2 = CreateTestWindow(3, parent.get());
 
   window0->AddTransientWindow(window2);
   EXPECT_EQ("1 3 2", ChildWindowIDsAsString(parent.get()));
 }
 
 }  // namespace mus