ash: Fix VideoDetectorTest's WindowState usage.

ash/wm/video_detector_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/video_detector.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/wm_event.h"
@@ skipping 266 matching lines @@
 // Test that the observer receives a true value when the window is fullscreen.
 TEST_F(VideoDetectorTest, FullscreenWindow) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("1024x768,1024x768");
 
   const gfx::Rect kLeftBounds(gfx::Point(), gfx::Size(1024, 768));
   scoped_ptr<aura::Window> window(
       CreateTestWindowInShell(SK_ColorRED, 12345, kLeftBounds));
-  wm::WindowState window_state(window.get());
+  wm::WindowState* window_state = wm::GetWindowState(window.get());
   const wm::WMEvent toggle_fullscreen_event(wm::WM_EVENT_TOGGLE_FULLSCREEN);
-  window_state.OnWMEvent(&toggle_fullscreen_event);
-  ASSERT_TRUE(window_state.IsFullscreen());
+  window_state->OnWMEvent(&toggle_fullscreen_event);
+  ASSERT_TRUE(window_state->IsFullscreen());
   window->Focus();
   const gfx::Rect kUpdateRegion(
       gfx::Point(),
       gfx::Size(VideoDetector::kMinUpdateWidth,
                 VideoDetector::kMinUpdateHeight));
   for (int i = 0; i < VideoDetector::kMinFramesPerSecond; ++i)
     detector_->OnWindowPaintScheduled(window.get(), kUpdateRegion);
   EXPECT_EQ(1, observer_->num_invocations());
   EXPECT_EQ(1, observer_->num_fullscreens());
   EXPECT_EQ(0, observer_->num_not_fullscreens());
 
   // Make the first window non-fullscreen and open a second fullscreen window on
   // a different desktop.
-  window_state.OnWMEvent(&toggle_fullscreen_event);
-  ASSERT_FALSE(window_state.IsFullscreen());
+  window_state->OnWMEvent(&toggle_fullscreen_event);
+  ASSERT_FALSE(window_state->IsFullscreen());
   const gfx::Rect kRightBounds(gfx::Point(1024, 0), gfx::Size(1024, 768));
   scoped_ptr<aura::Window> other_window(
       CreateTestWindowInShell(SK_ColorBLUE, 6789, kRightBounds));
-  wm::WindowState other_window_state(other_window.get());
-  other_window_state.OnWMEvent(&toggle_fullscreen_event);
-  ASSERT_TRUE(other_window_state.IsFullscreen());
+  wm::WindowState* other_window_state = wm::GetWindowState(other_window.get());
+  other_window_state->OnWMEvent(&toggle_fullscreen_event);
+  ASSERT_TRUE(other_window_state->IsFullscreen());
 
   // When video is detected in the first (now non-fullscreen) window, fullscreen
   // video should still be reported due to the second window being fullscreen.
   // This avoids situations where non-fullscreen video could be reported when
   // multiple videos are playing in fullscreen and non-fullscreen windows.
   observer_->reset_stats();
   AdvanceTime(base::TimeDelta::FromSeconds(2));
   for (int i = 0; i < VideoDetector::kMinFramesPerSecond; ++i)
     detector_->OnWindowPaintScheduled(window.get(), kUpdateRegion);
   EXPECT_EQ(1, observer_->num_invocations());
   EXPECT_EQ(1, observer_->num_fullscreens());
   EXPECT_EQ(0, observer_->num_not_fullscreens());
 
   // Make the second window non-fullscreen and check that the next video report
   // is non-fullscreen.
-  other_window_state.OnWMEvent(&toggle_fullscreen_event);
-  ASSERT_FALSE(other_window_state.IsFullscreen());
+  other_window_state->OnWMEvent(&toggle_fullscreen_event);
+  ASSERT_FALSE(other_window_state->IsFullscreen());
   observer_->reset_stats();
   AdvanceTime(base::TimeDelta::FromSeconds(2));
   for (int i = 0; i < VideoDetector::kMinFramesPerSecond; ++i)
     detector_->OnWindowPaintScheduled(window.get(), kUpdateRegion);
   EXPECT_EQ(1, observer_->num_invocations());
   EXPECT_EQ(0, observer_->num_fullscreens());
   EXPECT_EQ(1, observer_->num_not_fullscreens());
 }
 
 }  // namespace test
 }  // namespace ash