Makes CaptureController be created and owned by WMState

ash/test/ash_test_helper.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/test/ash_test_helper.h"
 
 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/test/material_design_controller_test_api.h"
 #include "ash/common/test/test_new_window_client.h"
@@ skipping 174 matching lines @@
   }
 #endif
 
   ui::TerminateContextFactoryForTests();
 
   TestSystemTrayDelegate::SetSystemUpdateRequired(false);
 
   ui::ShutdownInputMethodForTesting();
   zero_duration_mode_.reset();
 
-  CHECK(!::wm::ScopedCaptureClient::IsActive());
+  views_delegate_.reset();
+  wm_state_.reset();
 
-  views_delegate_.reset();
+  CHECK(!::wm::CaptureController::Get());
 }
 
 void AshTestHelper::RunAllPendingInMessageLoop() {
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
 }
 
 // static
 TestSessionStateDelegate* AshTestHelper::GetTestSessionStateDelegate() {
   CHECK(WmShell::HasInstance());
@@ skipping 13 matching lines @@
 bool AshTestHelper::SupportsMultipleDisplays() {
 #if defined(OS_WIN)
   return false;
 #else
   return true;
 #endif
 }
 
 }  // namespace test
 }  // namespace ash