Nukes ViewManager arg from ViewManagerDelegate::OnEmbed

mojo/services/view_manager/public/cpp/tests/view_manager_unittest.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/view_manager/public/cpp/view_manager.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "mojo/application_manager/application_manager.h"
@@ skipping 29 matching lines @@
 }
 
 void QuitRunLoop() {
   current_run_loop->Quit();
 }
 
 class ConnectApplicationLoader : public ApplicationLoader,
                                  public ApplicationDelegate,
                                  public ViewManagerDelegate {
  public:
-  typedef base::Callback<void(ViewManager*, View*)> LoadedCallback;
+  typedef base::Callback<void(View*)> LoadedCallback;
 
   explicit ConnectApplicationLoader(const LoadedCallback& callback)
       : callback_(callback) {}
   ~ConnectApplicationLoader() override {}
 
  private:
   // Overridden from ApplicationDelegate:
   void Initialize(ApplicationImpl* app) override {
     view_manager_client_factory_.reset(
         new ViewManagerClientFactory(app->shell(), this));
@@ skipping 12 matching lines @@
 
   void OnApplicationError(ApplicationManager* manager,
                           const GURL& url) override {}
 
   bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
     connection->AddService(view_manager_client_factory_.get());
     return true;
   }
 
   // Overridden from ViewManagerDelegate:
-  void OnEmbed(ViewManager* view_manager,
-               View* root,
+  void OnEmbed(View* root,
                ServiceProviderImpl* exported_services,
                scoped_ptr<ServiceProvider> imported_services) override {
-    callback_.Run(view_manager, root);
+    callback_.Run(root);
   }
   void OnViewManagerDisconnected(ViewManager* view_manager) override {}
 
   ScopedVector<ApplicationImpl> apps_;
   LoadedCallback callback_;
   scoped_ptr<ViewManagerClientFactory> view_manager_client_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectApplicationLoader);
 };
 
@@ skipping 212 matching lines @@
             new ConnectApplicationLoader(ready_callback)),
         GURL(kWindowManagerURL));
     test_helper_.SetLoaderForURL(
         scoped_ptr<ApplicationLoader>(
             new ConnectApplicationLoader(ready_callback)),
         GURL(kEmbeddedApp1URL));
 
     // TODO(sky): resolve this. Need to establish initial connection.
   }
 
-  void OnViewManagerLoaded(ViewManager* view_manager, View* root) {
-    loaded_view_manager_ = view_manager;
+  void OnViewManagerLoaded(View* root) {
+    loaded_view_manager_ = root->view_manager();
     connect_loop_->Quit();
   }
 
   void RunRunLoop() {
     base::RunLoop run_loop;
     connect_loop_ = &run_loop;
     connect_loop_->Run();
     connect_loop_ = NULL;
   }
 
@@ skipping 312 matching lines @@
 
 // TODO(beng): tests for focus:
 // - focus between two views known to a connection
 // - focus between views unknown to one of the connections.
 // - focus between views unknown to either connection.
 
 // TODO(sky): need test of root being destroyed with existing views. See
 // 434555 for specific case.
 
 }  // namespace mojo