Makes CaptureController be created and owned by WMState

ui/views/corewm/desktop_capture_controller_unittest.cc

 // Copyright (c) 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 "ui/wm/core/capture_controller.h"
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/test_window_delegate.h"
@@ skipping 82 matching lines @@
 // the window which had capture receives the gesture.
 // TODO(sky): move this test, it should be part of ScopedCaptureClient tests.
 TEST_F(DesktopCaptureControllerTest, CaptureWindowInputEventTest) {
   std::unique_ptr<aura::client::ScreenPositionClient> desktop_position_client1;
   std::unique_ptr<aura::client::ScreenPositionClient> desktop_position_client2;
 
   std::unique_ptr<Widget> widget1(new Widget());
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   std::unique_ptr<wm::ScopedCaptureClient> scoped_capture_client(
       new wm::ScopedCaptureClient(params.context->GetRootWindow()));
-  aura::client::CaptureClient* capture_client =
-      scoped_capture_client->capture_client();
+  aura::client::CaptureClient* capture_client = wm::CaptureController::Get();
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.bounds = gfx::Rect(50, 50, 650, 650);
   widget1->Init(params);
   internal::RootView* root1 =
       static_cast<internal::RootView*>(widget1->GetRootView());
 
   desktop_position_client1.reset(
       new DesktopScreenPositionClient(params.context->GetRootWindow()));
   aura::client::SetScreenPositionClient(
       widget1->GetNativeView()->GetRootWindow(),
@@ skipping 20 matching lines @@
       desktop_position_client2.get());
   ui::EventDispatchDetails details;
 
   DesktopViewInputTest* v2 = new DesktopViewInputTest();
   v2->SetBoundsRect(gfx::Rect(0, 0, 300, 300));
   root2->AddChildView(v2);
   widget2->Show();
 
   EXPECT_FALSE(widget1->GetNativeView()->HasCapture());
   EXPECT_FALSE(widget2->GetNativeView()->HasCapture());
-  EXPECT_EQ(reinterpret_cast<aura::Window*>(0),
-            capture_client->GetCaptureWindow());
+  EXPECT_EQ(nullptr, capture_client->GetCaptureWindow());
 
   widget1->GetNativeView()->SetCapture();
   EXPECT_TRUE(widget1->GetNativeView()->HasCapture());
   EXPECT_FALSE(widget2->GetNativeView()->HasCapture());
   EXPECT_EQ(capture_client->GetCaptureWindow(), widget1->GetNativeView());
 
   ui::GestureEvent g1(80, 80, 0, base::TimeTicks(),
                       ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS));
   details = root1->OnEventFromSource(&g1);
   EXPECT_FALSE(details.dispatcher_destroyed);
@@ skipping 16 matching lines @@
 
   EXPECT_TRUE(v2->received_gesture_event());
   EXPECT_FALSE(v1->received_gesture_event());
 
   widget1->CloseNow();
   widget2->CloseNow();
   RunPendingMessages();
 }
 
 }  // namespace views