Revert of services/ui: Revert CLs that broke Windows.

ui/views/mus/window_manager_connection.cc

 // Copyright 2015 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/mus/window_manager_connection.h"
 
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/threading/thread_local.h"
@@ skipping 73 matching lines @@
     internal::NativeWidgetDelegate* delegate) {
   // TYPE_CONTROL widgets require a NativeWidgetAura. So we let this fall
   // through, so that the default NativeWidgetPrivate::CreateNativeWidget() is
   // used instead.
   if (init_params.type == Widget::InitParams::TYPE_CONTROL)
     return nullptr;
   std::map<std::string, std::vector<uint8_t>> properties = props;
   NativeWidgetMus::ConfigurePropertiesForNewWindow(init_params, &properties);
   properties[ui::mojom::WindowManager::kAppID_Property] =
       mojo::ConvertTo<std::vector<uint8_t>>(identity_.name());
-  return new NativeWidgetMus(delegate, connector_, NewWindow(properties),
+  return new NativeWidgetMus(delegate, NewWindow(properties),
                              ui::mojom::SurfaceType::DEFAULT);
 }
 
 void WindowManagerConnection::AddPointerWatcher(PointerWatcher* watcher) {
   // TODO(riajiang): Support multiple event matchers (crbug.com/627146).
   DCHECK(!HasTouchEventWatcher());
   bool had_watcher = HasPointerWatcher();
   pointer_watchers_.AddObserver(watcher);
   if (!had_watcher) {
     // Start a watcher for pointer down.
@@ skipping 126 matching lines @@
 void WindowManagerConnection::OnWindowManagerFrameValuesChanged() {
   if (client_)
     NativeWidgetMus::NotifyFrameChanged(client_.get());
 }
 
 gfx::Point WindowManagerConnection::GetCursorScreenPoint() {
   return client_->GetCursorScreenPoint();
 }
 
 }  // namespace views