[Ozone-GBM] Pumb DriWindowDelegate throughout the platform

ui/ozone/platform/dri/gpu_platform_support_gbm.cc

 // Copyright 2014 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/ozone/platform/dri/gpu_platform_support_gbm.h"
 
 #include "ipc/ipc_message_macros.h"
 #include "ui/ozone/common/gpu/ozone_gpu_messages.h"
 #include "ui/ozone/platform/dri/dri_surface_factory.h"
 #include "ui/ozone/platform/dri/dri_window_delegate_impl.h"
@@ skipping 48 matching lines @@
 void GpuPlatformSupportGbm::OnCreateWindowDelegate(
     gfx::AcceleratedWidget widget) {
   // Due to how the GPU process starts up this IPC call may happen after the IPC
   // to create a surface. Since a surface wants to know the window associated
   // with it, we create it ahead of time. So when this call happens we do not
   // create a delegate if it already exists.
   if (!window_manager_->HasWindowDelegate(widget)) {
     scoped_ptr<DriWindowDelegate> delegate(
         new DriWindowDelegateImpl(widget, screen_manager_));
     delegate->Initialize();
-    window_manager_->AddWindowDelegate(widget, delegate.get());
-
-    std::pair<WidgetToWindowDelegateMap::iterator, bool> result =
-        window_delegate_owner_.add(widget, delegate.Pass());
-    DCHECK(result.second) << "Delegate already added.";
+    window_manager_->AddWindowDelegate(widget, delegate.Pass());
   }
 }
 
 void GpuPlatformSupportGbm::OnDestroyWindowDelegate(
     gfx::AcceleratedWidget widget) {
   scoped_ptr<DriWindowDelegate> delegate =
-      window_delegate_owner_.take_and_erase(widget);
-  DCHECK(delegate) << "Attempting to remove non-existing delegate.";
-
-  window_manager_->RemoveWindowDelegate(widget);
+      window_manager_->RemoveWindowDelegate(widget);
   delegate->Shutdown();
 }
 
 void GpuPlatformSupportGbm::OnWindowBoundsChanged(gfx::AcceleratedWidget widget,
                                                   const gfx::Rect& bounds) {
   window_manager_->GetWindowDelegate(widget)->OnBoundsChanged(bounds);
 }
 
 void GpuPlatformSupportGbm::OnCursorSet(gfx::AcceleratedWidget widget,
                                         const SkBitmap& bitmap,
                                         const gfx::Point& location) {
   dri_->SetHardwareCursor(widget, bitmap, location);
 }
 
 void GpuPlatformSupportGbm::OnCursorMove(gfx::AcceleratedWidget widget,
                                          const gfx::Point& location) {
   dri_->MoveHardwareCursor(widget, location);
 }
 
 }  // namespace ui