linux_aura: Fix cursor memeory leak, which was redding the lsan bot.

ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

 // Copyright (c) 2012 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_native_widget_aura.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/aura_constants.h"
@@ skipping 192 matching lines @@
 
  private:
   DesktopNativeWidgetAura* desktop_native_widget_aura_;
 
   DISALLOW_COPY_AND_ASSIGN(FocusManagerEventHandler);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopNativeWidgetAura, public:
 
 DesktopNativeCursorManager* DesktopNativeWidgetAura::native_cursor_manager_ =

[tdanderson, 2014/01/14 17:42:27]

|native_cursor_manager_| is OK to leave as a raw pointer here because it is
owned by the |cursor_manager_|. Is that correct?

     NULL;
-views::corewm::CursorManager* DesktopNativeWidgetAura::cursor_manager_ = NULL;
+base::LazyInstance<scoped_ptr<views::corewm::CursorManager> >
+    DesktopNativeWidgetAura::cursor_manager_ = LAZY_INSTANCE_INITIALIZER;
 
 DesktopNativeWidgetAura::DesktopNativeWidgetAura(
     internal::NativeWidgetDelegate* delegate)
     : ownership_(Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET),
       close_widget_factory_(this),
       can_activate_(true),
       desktop_root_window_host_(NULL),
       content_window_container_(NULL),
       content_window_(new aura::Window(this)),
       native_widget_delegate_(delegate),
@@ skipping 168 matching lines @@
   root_window_event_filter_ = new corewm::CompoundEventFilter;
   // Pass ownership of the filter to the root_window.
   root_window_->window()->SetEventFilter(root_window_event_filter_);
 
   // |root_window_| must be added to |native_cursor_manager_| before
   // OnRootWindowCreated() is called.
   if (!native_cursor_manager_) {
     native_cursor_manager_ = new DesktopNativeCursorManager(
         DesktopCursorLoaderUpdater::Create());
   }
-  if (!cursor_manager_) {
-    cursor_manager_ = new views::corewm::CursorManager(
-        scoped_ptr<corewm::NativeCursorManager>(native_cursor_manager_));
+  if (!cursor_manager_.Get()) {
+    cursor_manager_.Get().reset(new views::corewm::CursorManager(
+        scoped_ptr<corewm::NativeCursorManager>(native_cursor_manager_)));
   }
   native_cursor_manager_->AddRootWindow(root_window_.get());
-  aura::client::SetCursorClient(root_window_->window(), cursor_manager_);
+  aura::client::SetCursorClient(root_window_->window(),
+                                cursor_manager_.Get().get());
 
   desktop_root_window_host_->OnRootWindowCreated(root_window_.get(), params);
 
   UpdateWindowTransparency();
 
   capture_client_.reset(new DesktopCaptureClient(root_window_->window()));
 
   corewm::FocusController* focus_controller =
       new corewm::FocusController(new DesktopFocusRules(content_window_));
   focus_client_.reset(focus_controller);
@@ skipping 702 matching lines @@
   input_method_event_filter_->SetInputMethodPropertyInRootWindow(
       root_window_->window());
   root_window_event_filter_->AddHandler(input_method_event_filter_.get());
 }
 
 void DesktopNativeWidgetAura::UpdateWindowTransparency() {
   content_window_->SetTransparent(ShouldUseNativeFrame());
 }
 
 }  // namespace views