Window ownership -> WindowTreeHost

ui/views/corewm/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/views/corewm/capture_controller.h"
 
 #include "base/logging.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/event_generator.h"
@@ skipping 24 matching lines @@
     capture_controller_.reset(new corewm::ScopedCaptureClient(root_window()));
 
     second_host_.reset(aura::WindowTreeHost::Create(gfx::Rect(0, 0, 800, 600)));
     second_host_->InitHost();
     second_host_->window()->Show();
     second_host_->SetBounds(gfx::Rect(800, 600));
     second_capture_controller_.reset(
         new corewm::ScopedCaptureClient(second_host_->window()));
 
 #if !defined(OS_CHROMEOS)
-    desktop_position_client_.reset(new DesktopScreenPositionClient());
-    aura::client::SetScreenPositionClient(root_window(),
-                                          desktop_position_client_.get());
+    desktop_position_client_.reset(
+        new DesktopScreenPositionClient(root_window()));
 
-    second_desktop_position_client_.reset(new DesktopScreenPositionClient());
-    aura::client::SetScreenPositionClient(
-        second_host_->window(),
-        second_desktop_position_client_.get());
+    second_desktop_position_client_.reset(
+        new DesktopScreenPositionClient(second_host_->window()));
 #endif
   }
 
   virtual void TearDown() OVERRIDE {
     RunAllPendingInMessageLoop();
 
 #if !defined(OS_CHROMEOS)
     second_desktop_position_client_.reset();
 #endif
     second_capture_controller_.reset();
@@ skipping 99 matching lines @@
   EXPECT_EQ(static_cast<aura::Window*>(NULL), GetCaptureWindow());
   EXPECT_EQ(static_cast<aura::Window*>(NULL), GetSecondCaptureWindow());
   ui::TouchEvent touch_event(
       ui::ET_TOUCH_PRESSED, gfx::Point(), 0, 0, ui::EventTimeForNow(), 1.0f,
       1.0f, 1.0f, 1.0f);
   EXPECT_EQ(static_cast<ui::GestureConsumer*>(w2.get()),
             ui::GestureRecognizer::Get()->GetTouchLockedTarget(touch_event));
 }
 
 }  // namespace views