Makes CaptureController be created and owned by WMState

ash/test/ash_test_helper.cc

Index: ash/test/ash_test_helper.cc
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
index 8d680eb526deb14d657bdcc849f14fd5b71e5f18..6fd3841bf5c2abff3ad8717ab938eb2f2fbd4288 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -192,9 +192,10 @@ void AshTestHelper::TearDown() {
   ui::ShutdownInputMethodForTesting();
   zero_duration_mode_.reset();
 
-  CHECK(!::wm::ScopedCaptureClient::IsActive());
-
   views_delegate_.reset();
+  wm_state_.reset();
+
+  CHECK(!::wm::CaptureController::Get());
 }
 
 void AshTestHelper::RunAllPendingInMessageLoop() {