Re-enable mojo_core_window_manager_unittests

mojo/services/window_manager/window_manager_app.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 "mojo/services/window_manager/window_manager_app.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "mojo/aura/aura_init.h"
 #include "mojo/aura/window_tree_host_mojo.h"
@@ skipping 153 matching lines @@
   capture_client_.reset(
       new wm::ScopedCaptureClient(window_tree_host_->window()));
   wm::FocusController* focus_controller =
       new wm::FocusController(new WMFocusRules);
   activation_client_ = focus_controller;
   focus_client_.reset(focus_controller);
 
   focus_client_->AddObserver(this);
   activation_client_->AddObserver(this);
 
-  wrapped_delegate_->OnRootAdded(view_manager, root);
+  if (wrapped_delegate_)

[jamesr, 2014/07/25 00:20:29]

after https://codereview.chromium.org/400113005, this delegate will always be
NULL when loading the window manager as a standalone app.  Is null checking here
the right thing to do?

+    wrapped_delegate_->OnRootAdded(view_manager, root);
 
   for (Connections::const_iterator it = connections_.begin();
        it != connections_.end(); ++it) {
     (*it)->NotifyReady();
   }
 }
 
 void WindowManagerApp::OnViewManagerDisconnected(
     ViewManager* view_manager) {
   DCHECK_EQ(view_manager_, view_manager);
-  wrapped_delegate_->OnViewManagerDisconnected(view_manager);
+  if (wrapped_delegate_)
+    wrapped_delegate_->OnViewManagerDisconnected(view_manager);
   root_->RemoveObserver(this);
   root_ = NULL;
   view_manager_ = NULL;
   base::MessageLoop::current()->Quit();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowManagerApp, NodeObserver implementation:
 
 void WindowManagerApp::OnTreeChanged(
@@ skipping 75 matching lines @@
   NodeIdToWindowMap::iterator it = node_id_to_window_map_.find(id);
   DCHECK(it != node_id_to_window_map_.end());
   scoped_ptr<aura::Window> window(it->second);
   node_id_to_window_map_.erase(it);
   Node::Children::const_iterator child = node->children().begin();
   for (; child != node->children().end(); ++child)
     UnregisterSubtree((*child)->id());
 }
 
 }  // namespace mojo