aura/ash cleanup: Use a single window-key for constrained windows.

ash/wm/solo_window_tracker_unittest.cc

 // Copyright 2013 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/solo_window_tracker.h"
 
 #include "ash/ash_constants.h"
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
@@ skipping 254 matching lines @@
 // Constrained windows should not use solo headers.
 TEST_F(SoloWindowTrackerTest, Constrained) {
   scoped_ptr<aura::Window> w1(CreateWindowInPrimary());
   w1->Show();
 
   // We only have one window, so it should use a solo header.
   EXPECT_EQ(w1.get(), GetWindowWithSoloHeaderInPrimary());
 
   // Create a fake constrained window.
   scoped_ptr<aura::Window> w2(CreateWindowInPrimary());
-  w2->SetProperty(ash::kConstrainedWindowKey, true);
+  w2->SetProperty(aura::client::kConstrainedWindowKey, true);
   w2->Show();
 
   // Despite two windows, the first window should still be considered "solo"
   // because constrained windows aren't included in the computation.
   EXPECT_EQ(w1.get(), GetWindowWithSoloHeaderInPrimary());
 }
 
 // Non-drawing windows should not affect the solo computation.
 TEST_F(SoloWindowTrackerTest, NotDrawn) {
   aura::Window* w = CreateWindowInPrimary();
@@ skipping 128 matching lines @@
   w.reset();
   EXPECT_EQ(NULL, GetWindowWithSoloHeaderInPrimary());
 
   // Recreate another window again.
   w.reset(CreateWindowInPrimary());
   w->Show();
   EXPECT_EQ(w.get(), GetWindowWithSoloHeaderInPrimary());
 }
 
 }  // namespace ash