Nukes ViewManager arg from ViewManagerDelegate::OnEmbed

sky/tools/tester/tester.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 <iostream>
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_delegate.h"
@@ skipping 43 matching lines @@
 }  // namespace
 
 class SkyTester : public mojo::ApplicationDelegate,
                   public mojo::ViewManagerDelegate,
                   public window_manager::WindowManagerDelegate,
                   public mojo::ViewObserver,
                   public TestRunnerClient {
  public:
   SkyTester()
       : window_manager_app_(new window_manager::WindowManagerApp(this, this)),
-        view_manager_(NULL),
         root_(NULL),
         content_(NULL),
         weak_ptr_factory_(this) {}
   virtual ~SkyTester() {}
 
  private:
   // Overridden from mojo::ApplicationDelegate:
   virtual void Initialize(mojo::ApplicationImpl* impl) override {
     window_manager_app_->Initialize(impl);
 
     if (impl->args().size() >= 2)
       url_from_args_ = impl->args()[1];
   }
   virtual bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) override {
     window_manager_app_->ConfigureIncomingConnection(connection);
     if (test_runner_)
       connection->AddService(test_runner_->test_harness_factory());
     return true;
   }
 
   // Overridden from mojo::ViewManagerDelegate:
   virtual void OnEmbed(
-      mojo::ViewManager* view_manager,
       mojo::View* root,
       mojo::ServiceProviderImpl* exported_services,
       scoped_ptr<mojo::ServiceProvider> remote_service_provider) override {
-    view_manager_ = view_manager;
     root_ = root;
     root_->AddObserver(this);
 
-    content_ = mojo::View::Create(view_manager_);
+    content_ = mojo::View::Create(root->view_manager());
     content_->SetBounds(root_->bounds());
     root_->AddChild(content_);
     content_->SetVisible(true);
 
     std::cout << "#READY\n";
     std::cout.flush();
     ScheduleRun();
   }
 
   // Overridden from window_manager::WindowManagerDelegate:
   virtual void Embed(
       const mojo::String& url,
       mojo::InterfaceRequest<mojo::ServiceProvider> service_provider) override {
   }
 
   virtual void OnViewManagerDisconnected(
       mojo::ViewManager* view_manager) override {
-    view_manager_ = NULL;
     root_ = NULL;
   }
 
   virtual void OnViewDestroyed(mojo::View* view) override {
     view->RemoveObserver(this);
   }
 
   virtual void OnViewBoundsChanged(mojo::View* view,
                                    const mojo::Rect& old_bounds,
                                    const mojo::Rect& new_bounds) override {
@@ skipping 27 matching lines @@
   }
 
   void DispatchInputEvent(mojo::EventPtr event) override {
     window_manager_app_->DispatchInputEventToView(content_, event.Pass());
   }
 
   scoped_ptr<window_manager::WindowManagerApp> window_manager_app_;
 
   std::string url_from_args_;
 
-  mojo::ViewManager* view_manager_;
   mojo::View* root_;
   mojo::View* content_;
 
   scoped_ptr<TestRunner> test_runner_;
 
   base::WeakPtrFactory<SkyTester> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SkyTester);
 };
 
 }  // namespace tester
 }  // namespace examples
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new sky::tester::SkyTester);
   return runner.Run(shell_handle);
 }