Makes CaptureController be created and owned by WMState

ui/views/test/views_test_helper_aura.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 "ui/views/test/views_test_helper_aura.h"
 
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/test/aura_test_helper.h"
 #include "ui/wm/core/capture_controller.h"
 #include "ui/wm/core/default_activation_client.h"
@@ skipping 36 matching lines @@
   // So, although it's optional, check the root window to detect failures before
   // they hit the CQ on other platforms.
   DCHECK(aura_test_helper_->root_window()->children().empty())
       << "Not all windows were closed.";
 
   if (screen_position_client_.get() ==
       aura::client::GetScreenPositionClient(GetContext()))
     aura::client::SetScreenPositionClient(GetContext(), nullptr);
 
   aura_test_helper_->TearDown();
-  CHECK(!wm::ScopedCaptureClient::IsActive());
+  CHECK(!wm::CaptureController::Get() ||
+        !wm::CaptureController::Get()->is_active());
 }
 
 gfx::NativeWindow ViewsTestHelperAura::GetContext() {
   return aura_test_helper_->root_window();
 }
 
 }  // namespace views