Update mojo sdk to rev cc531b32182099a5a034a99daff35ed5d38a61c8

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 169 matching lines @@
   ViewManagerTest()
       : connect_loop_(NULL),
         loaded_view_manager_(NULL),
         window_manager_(NULL),
         commit_count_(0) {}
 
  protected:
   ViewManager* window_manager() { return window_manager_; }
 
   View* CreateViewInParent(View* parent) {
-    ViewManager* parent_manager = ViewPrivate(parent).view_manager();
-    View* view = View::Create(parent_manager);
+    ViewManager* parent_manager = parent->view_manager();
+    View* view = parent_manager->CreateView();
     view->SetVisible(true);
     parent->AddChild(view);
     return view;
   }
 
   // Embeds another version of the test app @ view.
   ViewManager* Embed(ViewManager* view_manager, View* view) {
-    DCHECK_EQ(view_manager, ViewPrivate(view).view_manager());
+    DCHECK_EQ(view_manager, view->view_manager());
     view->Embed(kEmbeddedApp1URL);
     RunRunLoop();
     return GetLoadedViewManager();
   }
 
   ViewManager* GetLoadedViewManager() {
     ViewManager* view_manager = loaded_view_manager_;
     loaded_view_manager_ = NULL;
     return view_manager;
   }
@@ skipping 13 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;
   }
 
   base::RunLoop* connect_loop_;
   shell::ShellTestHelper test_helper_;
   // Used to receive the most recent view manager loaded by an embed action.
   ViewManager* loaded_view_manager_;
   // The View Manager connection held by the window manager (app running at the
   // root view).
   ViewManager* window_manager_;
   int commit_count_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewManagerTest);
 };
 
 // TODO(sky): all of these tests are disabled as each test triggers running
 // ViewsInit, which tries to register the same set of paths with the
 // PathService, triggering a DCHECK.
 TEST_F(ViewManagerTest, DISABLED_SetUp) {}
 
 TEST_F(ViewManagerTest, DISABLED_Embed) {
-  View* view = View::Create(window_manager());
+  View* view = window_manager()->CreateView();
   view->SetVisible(true);
   window_manager()->GetRoot()->AddChild(view);
   ViewManager* embedded = Embed(window_manager(), view);
   EXPECT_TRUE(NULL != embedded);
 
   View* view_in_embedded = embedded->GetRoot();
   EXPECT_EQ(view->parent(), window_manager()->GetRoot());
   EXPECT_EQ(NULL, view_in_embedded->parent());
 }
 
 // Window manager has two views, N1 and N11. Embeds A at N1. A should not see
 // N11.
 // TODO(sky): Update client lib to match server.
 TEST_F(ViewManagerTest, DISABLED_EmbeddedDoesntSeeChild) {
-  View* view = View::Create(window_manager());
+  View* view = window_manager()->CreateView();
   view->SetVisible(true);
   window_manager()->GetRoot()->AddChild(view);
-  View* nested = View::Create(window_manager());
+  View* nested = window_manager()->CreateView();
   nested->SetVisible(true);
   view->AddChild(nested);
 
   ViewManager* embedded = Embed(window_manager(), view);
   EXPECT_EQ(embedded->GetRoot()->children().front()->id(),
             nested->id());
   EXPECT_TRUE(embedded->GetRoot()->children().empty());
   EXPECT_TRUE(nested->parent() == NULL);
 }
 
 // http://crbug.com/396300
 TEST_F(ViewManagerTest, DISABLED_ViewManagerDestroyed_CleanupView) {
-  View* view = View::Create(window_manager());
+  View* view = window_manager()->CreateView();
   view->SetVisible(true);
   window_manager()->GetRoot()->AddChild(view);
   ViewManager* embedded = Embed(window_manager(), view);
 
   Id view_id = view->id();
 
   UnloadApplication(GURL(kWindowManagerURL));
 
   std::set<Id> views;
   views.insert(view_id);
@@ skipping 10 matching lines @@
 // -> the view should still exist (since the second connection is live) but
 //    should be disconnected from any views.
 // http://crbug.com/396300
 //
 // TODO(beng): The new test should validate the scenario as described above
 //             except that the second connection still has a valid tree.
 
 // Verifies that bounds changes applied to a view hierarchy in one connection
 // are reflected to another.
 TEST_F(ViewManagerTest, DISABLED_SetBounds) {
-  View* view = View::Create(window_manager());
+  View* view = window_manager()->CreateView();
   view->SetVisible(true);
   window_manager()->GetRoot()->AddChild(view);
   ViewManager* embedded = Embed(window_manager(), view);
 
   View* view_in_embedded = embedded->GetViewById(view->id());
   EXPECT_EQ(view->bounds(), view_in_embedded->bounds());
 
   Rect rect;
   rect.width = rect.height = 100;
   view->SetBounds(rect);
   EXPECT_NE(view->bounds(), view_in_embedded->bounds());
   WaitForBoundsToChange(view_in_embedded);
   EXPECT_EQ(view->bounds(), view_in_embedded->bounds());
 }
 
 // Verifies that bounds changes applied to a view owned by a different
 // connection are refused.
 TEST_F(ViewManagerTest, DISABLED_SetBoundsSecurity) {
-  View* view = View::Create(window_manager());
+  View* view = window_manager()->CreateView();
   view->SetVisible(true);
   window_manager()->GetRoot()->AddChild(view);
   ViewManager* embedded = Embed(window_manager(), view);
 
   View* view_in_embedded = embedded->GetViewById(view->id());
   Rect rect;
   rect.width = 800;
   rect.height = 600;
   view->SetBounds(rect);
   WaitForBoundsToChange(view_in_embedded);
 
   rect.width = 1024;
   rect.height = 768;
   view_in_embedded->SetBounds(rect);
   // Bounds change should have been rejected.
   EXPECT_EQ(view->bounds(), view_in_embedded->bounds());
 }
 
 // Verifies that a view can only be destroyed by the connection that created it.
 TEST_F(ViewManagerTest, DISABLED_DestroySecurity) {
-  View* view = View::Create(window_manager());
+  View* view = window_manager()->CreateView();
   view->SetVisible(true);
   window_manager()->GetRoot()->AddChild(view);
   ViewManager* embedded = Embed(window_manager(), view);
 
   View* view_in_embedded = embedded->GetViewById(view->id());
 
   ViewTracker tracker2(view_in_embedded);
   view_in_embedded->Destroy();
   // View should not have been destroyed.
   EXPECT_TRUE(tracker2.is_valid());
 
   ViewTracker tracker1(view);
   view->Destroy();
   EXPECT_FALSE(tracker1.is_valid());
 }
 
 TEST_F(ViewManagerTest, DISABLED_MultiRoots) {
-  View* view1 = View::Create(window_manager());
+  View* view1 = window_manager()->CreateView();
   view1->SetVisible(true);
   window_manager()->GetRoot()->AddChild(view1);
-  View* view2 = View::Create(window_manager());
+  View* view2 = window_manager()->CreateView();
   view2->SetVisible(true);
   window_manager()->GetRoot()->AddChild(view2);
   ViewManager* embedded1 = Embed(window_manager(), view1);
   ViewManager* embedded2 = Embed(window_manager(), view2);
   EXPECT_EQ(embedded1, embedded2);
 }
 
 TEST_F(ViewManagerTest, DISABLED_EmbeddingIdentity) {
-  View* view = View::Create(window_manager());
+  View* view = window_manager()->CreateView();
   view->SetVisible(true);
   window_manager()->GetRoot()->AddChild(view);
   ViewManager* embedded = Embed(window_manager(), view);
   EXPECT_EQ(kWindowManagerURL, embedded->GetEmbedderURL());
 }
 
 TEST_F(ViewManagerTest, DISABLED_Reorder) {
-  View* view1 = View::Create(window_manager());
+  View* view1 = window_manager()->CreateView();
   view1->SetVisible(true);
   window_manager()->GetRoot()->AddChild(view1);
 
   ViewManager* embedded = Embed(window_manager(), view1);
 
-  View* view11 = View::Create(embedded);
+  View* view11 = embedded->CreateView();
   view11->SetVisible(true);
   embedded->GetRoot()->AddChild(view11);
-  View* view12 = View::Create(embedded);
+  View* view12 = embedded->CreateView();
   view12->SetVisible(true);
   embedded->GetRoot()->AddChild(view12);
 
   View* view1_in_wm = window_manager()->GetViewById(view1->id());
 
   {
     WaitForTreeSizeToMatch(view1, 2u);
     view11->MoveToFront();
     WaitForOrderChange(window_manager(),
                        window_manager()->GetViewById(view11->id()));
@@ skipping 33 matching lines @@
   }
 
   View* view_;
 
   DISALLOW_COPY_AND_ASSIGN(VisibilityChangeObserver);
 };
 
 }  // namespace
 
 TEST_F(ViewManagerTest, DISABLED_Visible) {
-  View* view1 = View::Create(window_manager());
+  View* view1 = window_manager()->CreateView();
   view1->SetVisible(true);
   window_manager()->GetRoot()->AddChild(view1);
 
   // Embed another app and verify initial state.
   ViewManager* embedded = Embed(window_manager(), view1);
   ASSERT_NE(nullptr, embedded->GetRoot());
   View* embedded_root = embedded->GetRoot();
   EXPECT_TRUE(embedded_root->visible());
   EXPECT_TRUE(embedded_root->IsDrawn());
 
@@ skipping 42 matching lines @@
   }
 
   View* view_;
 
   DISALLOW_COPY_AND_ASSIGN(DrawnChangeObserver);
 };
 
 }  // namespace
 
 TEST_F(ViewManagerTest, DISABLED_Drawn) {
-  View* view1 = View::Create(window_manager());
+  View* view1 = window_manager()->CreateView();
   view1->SetVisible(true);
   window_manager()->GetRoot()->AddChild(view1);
 
   // Embed another app and verify initial state.
   ViewManager* embedded = Embed(window_manager(), view1);
   ASSERT_NE(nullptr, embedded->GetRoot());
   View* embedded_root = embedded->GetRoot();
   EXPECT_TRUE(embedded_root->visible());
   EXPECT_TRUE(embedded_root->IsDrawn());
 
@@ skipping 17 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