Window ownership -> WindowTreeHost

ui/views/widget/desktop_aura/desktop_screen_x11_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/widget/desktop_aura/desktop_screen_x11.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 21 matching lines @@
  public:
   explicit ActivationWaiter(views::Widget* widget)
       : x_root_window_(DefaultRootWindow(gfx::GetXDisplay())),
         widget_xid_(0),
         active_(false) {
     const char* kAtomToCache[] = {
         "_NET_ACTIVE_WINDOW",
         NULL
     };
     atom_cache_.reset(new ui::X11AtomCache(gfx::GetXDisplay(), kAtomToCache));
-    widget_xid_ = widget->GetNativeWindow()->GetDispatcher()->host()->
+    widget_xid_ = widget->GetNativeWindow()->GetHost()->
          GetAcceleratedWidget();
     base::MessagePumpX11::Current()->AddDispatcherForRootWindow(this);
   }
 
   virtual ~ActivationWaiter() {
     base::MessagePumpX11::Current()->RemoveDispatcherForRootWindow(this);
   }
 
   // Blocks till |widget_xid_| becomes active.
   void Wait() {
@@ skipping 263 matching lines @@
       screen()->GetDisplayNearestWindow(window_one->GetNativeWindow()).id());
   EXPECT_EQ(
       kSecondDisplay,
       screen()->GetDisplayNearestWindow(window_two->GetNativeWindow()).id());
 
   window_one->CloseNow();
   window_two->CloseNow();
 }
 
 }  // namespace views