Mandoline webview: View => Window

components/web_view/frame_apptest.cc

 // Copyright 2015 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 "components/web_view/frame.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 115 matching lines @@
   }
 
   base::TimeTicks last_navigation_start_time() const {
     return last_navigation_start_time_;
   }
 
   // mojom::FrameClient:
   void OnConnect(mojom::FramePtr frame,
                  uint32_t change_id,
                  uint32_t window_id,
-                 mojom::ViewConnectType view_connect_type,
+                 mojom::WindowConnectType window_connect_type,
                  mojo::Array<mojom::FrameDataPtr> frames,
                  int64_t navigation_start_time_ticks,
                  const OnConnectCallback& callback) override {
     connect_count_++;
     connect_frames_ = frames.Pass();
     if (frame)
       server_frame_ = frame.Pass();
     callback.Run();
     if (!on_connect_callback_.is_null())
       on_connect_callback_.Run();
@@ skipping 58 matching lines @@
   base::Closure on_dispatch_load_event_callback_;
   LoadingStateChangedNotification last_loading_state_changed_notification_;
   uint32_t last_dispatch_load_event_frame_id_;
   base::TimeTicks last_navigation_start_time_;
 
   DISALLOW_COPY_AND_ASSIGN(TestFrameClient);
 };
 
 class FrameTest;
 
-// ViewAndFrame maintains the View and TestFrameClient associated with
+// WindowAndFrame maintains the Window and TestFrameClient associated with
 // a single FrameClient. In other words this maintains the data structures
 // needed to represent a client side frame. To obtain one use
 // FrameTest::WaitForViewAndFrame().
-class ViewAndFrame : public mus::WindowTreeDelegate {
+class WindowAndFrame : public mus::WindowTreeDelegate {
  public:
-  ~ViewAndFrame() override {
-    if (view_)
-      delete view_->connection();
+  ~WindowAndFrame() override {
+    if (window_)
+      delete window_->connection();
   }
 
-  // The View associated with the frame.
-  mus::Window* view() { return view_; }
+  // The Window associated with the frame.
+  mus::Window* window() { return window_; }
   TestFrameClient* test_frame_client() { return &test_frame_tree_client_; }
   mojom::Frame* server_frame() {
     return test_frame_tree_client_.server_frame();
   }
 
  private:
   friend class FrameTest;
 
-  ViewAndFrame()
-      : view_(nullptr), frame_client_binding_(&test_frame_tree_client_) {}
+  WindowAndFrame()
+      : window_(nullptr), frame_client_binding_(&test_frame_tree_client_) {}
 
-  void set_view(Window* view) { view_ = view; }
+  void set_window(Window* window) { window_ = window; }
 
-  // Runs a message loop until the view and frame data have been received.
+  // Runs a message loop until the window and frame data have been received.
   void WaitForViewAndFrame() { run_loop_.Run(); }
 
   mojo::InterfaceRequest<mojom::Frame> GetServerFrameRequest() {
     return test_frame_tree_client_.GetServerFrameRequest();
   }
 
   mojom::FrameClientPtr GetFrameClientPtr() {
     mojom::FrameClientPtr client_ptr;
     frame_client_binding_.Bind(GetProxy(&client_ptr));
     return client_ptr.Pass();
   }
 
   void Bind(mojo::InterfaceRequest<mojom::FrameClient> request) {
     ASSERT_FALSE(frame_client_binding_.is_bound());
     test_frame_tree_client_.set_on_connect_callback(
-        base::Bind(&ViewAndFrame::OnGotConnect, base::Unretained(this)));
+        base::Bind(&WindowAndFrame::OnGotConnect, base::Unretained(this)));
     frame_client_binding_.Bind(request.Pass());
   }
 
   void OnGotConnect() { QuitRunLoopIfNecessary(); }
 
   void QuitRunLoopIfNecessary() {
-    if (view_ && test_frame_tree_client_.connect_count())
+    if (window_ && test_frame_tree_client_.connect_count())
       run_loop_.Quit();
   }
 
   // Overridden from WindowTreeDelegate:
   void OnEmbed(Window* root) override {
-    view_ = root;
+    window_ = root;
     QuitRunLoopIfNecessary();
   }
   void OnConnectionLost(WindowTreeConnection* connection) override {
-    view_ = nullptr;
+    window_ = nullptr;
   }
 
-  mus::Window* view_;
+  mus::Window* window_;
   base::RunLoop run_loop_;
   TestFrameClient test_frame_tree_client_;
   mojo::Binding<mojom::FrameClient> frame_client_binding_;
 
-  DISALLOW_COPY_AND_ASSIGN(ViewAndFrame);
+  DISALLOW_COPY_AND_ASSIGN(WindowAndFrame);
 };
 
 class FrameTest : public mojo::test::ApplicationTestBase,
                   public mojo::ApplicationDelegate,
                   public mus::WindowTreeDelegate,
                   public mojo::InterfaceFactory<mus::mojom::WindowTreeClient>,
                   public mojo::InterfaceFactory<mojom::FrameClient> {
  public:
   FrameTest() : most_recent_connection_(nullptr), window_manager_(nullptr) {}
 
   WindowTreeConnection* most_recent_connection() {
     return most_recent_connection_;
   }
 
  protected:
   WindowTreeConnection* window_manager() { return window_manager_; }
   TestFrameTreeDelegate* frame_tree_delegate() {
     return frame_tree_delegate_.get();
   }
   FrameTree* frame_tree() { return frame_tree_.get(); }
-  ViewAndFrame* root_view_and_frame() { return root_view_and_frame_.get(); }
+  WindowAndFrame* root_window_and_frame() {
+    return root_window_and_frame_.get();
+  }
 
-  scoped_ptr<ViewAndFrame> NavigateFrameWithStartTime(
-      ViewAndFrame* view_and_frame,
+  scoped_ptr<WindowAndFrame> NavigateFrameWithStartTime(
+      WindowAndFrame* window_and_frame,
       base::TimeTicks navigation_start_time) {
     mojo::URLRequestPtr request(mojo::URLRequest::New());
     request->url = mojo::String::From(application_impl()->url());
     request->originating_time_ticks = navigation_start_time.ToInternalValue();
-    view_and_frame->server_frame()->RequestNavigate(
+    window_and_frame->server_frame()->RequestNavigate(
         mojom::NAVIGATION_TARGET_TYPE_EXISTING_FRAME,
-        view_and_frame->view()->id(), request.Pass());
+        window_and_frame->window()->id(), request.Pass());
     return WaitForViewAndFrame();
   }
 
-  scoped_ptr<ViewAndFrame> NavigateFrame(ViewAndFrame* view_and_frame) {
-    return NavigateFrameWithStartTime(view_and_frame, base::TimeTicks());
+  scoped_ptr<WindowAndFrame> NavigateFrame(WindowAndFrame* window_and_frame) {
+    return NavigateFrameWithStartTime(window_and_frame, base::TimeTicks());
   }
 
   // Creates a new shared frame as a child of |parent|.
-  scoped_ptr<ViewAndFrame> CreateChildViewAndFrame(ViewAndFrame* parent) {
-    mus::Window* child_frame_view =
-        parent->view()->connection()->NewWindow();
-    parent->view()->AddChild(child_frame_view);
+  scoped_ptr<WindowAndFrame> CreateChildWindowAndFrame(WindowAndFrame* parent) {
+    mus::Window* child_frame_window =
+        parent->window()->connection()->NewWindow();
+    parent->window()->AddChild(child_frame_window);
 
-    scoped_ptr<ViewAndFrame> view_and_frame(new ViewAndFrame);
-    view_and_frame->set_view(child_frame_view);
+    scoped_ptr<WindowAndFrame> window_and_frame(new WindowAndFrame);
+    window_and_frame->set_window(child_frame_window);
 
     mojo::Map<mojo::String, mojo::Array<uint8_t>> client_properties;
     client_properties.mark_non_null();
     parent->server_frame()->OnCreatedFrame(
-        view_and_frame->GetServerFrameRequest(),
-        view_and_frame->GetFrameClientPtr(), child_frame_view->id(),
+        window_and_frame->GetServerFrameRequest(),
+        window_and_frame->GetFrameClientPtr(), child_frame_window->id(),
         client_properties.Pass());
     frame_tree_delegate()->WaitForCreateFrame();
-    return HasFatalFailure() ? nullptr : view_and_frame.Pass();
+    return HasFatalFailure() ? nullptr : window_and_frame.Pass();
   }
 
   // Runs a message loop until the data necessary to represent to a client side
   // frame has been obtained.
-  scoped_ptr<ViewAndFrame> WaitForViewAndFrame() {
-    DCHECK(!view_and_frame_);
-    view_and_frame_.reset(new ViewAndFrame);
-    view_and_frame_->WaitForViewAndFrame();
-    return view_and_frame_.Pass();
+  scoped_ptr<WindowAndFrame> WaitForViewAndFrame() {
+    DCHECK(!window_and_frame_);
+    window_and_frame_.reset(new WindowAndFrame);
+    window_and_frame_->WaitForViewAndFrame();
+    return window_and_frame_.Pass();
   }
 
  private:
   // ApplicationTestBase:
   ApplicationDelegate* GetApplicationDelegate() override { return this; }
 
   // ApplicationDelegate implementation.
   bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) override {
     connection->AddService<mus::mojom::WindowTreeClient>(this);
@@ skipping 16 matching lines @@
 
     ASSERT_TRUE(DoRunLoopWithTimeout());
     std::swap(window_manager_, most_recent_connection_);
 
     // Creates a FrameTree, which creates a single frame. Wait for the
     // FrameClient to be connected to.
     frame_tree_delegate_.reset(new TestFrameTreeDelegate(application_impl()));
     scoped_ptr<FrameConnection> frame_connection =
         CreateFrameConnection(application_impl());
     mojom::FrameClient* frame_client = frame_connection->frame_client();
-    mus::mojom::WindowTreeClientPtr view_tree_client =
+    mus::mojom::WindowTreeClientPtr window_tree_client =
         frame_connection->GetWindowTreeClient();
     mus::Window* frame_root_view = window_manager()->NewWindow();
     window_manager()->GetRoot()->AddChild(frame_root_view);
     frame_tree_.reset(new FrameTree(
-        0u, frame_root_view, view_tree_client.Pass(),
+        0u, frame_root_view, window_tree_client.Pass(),
         frame_tree_delegate_.get(), frame_client, frame_connection.Pass(),
         Frame::ClientPropertyMap(), base::TimeTicks::Now()));
-    root_view_and_frame_ = WaitForViewAndFrame();
+    root_window_and_frame_ = WaitForViewAndFrame();
   }
 
   // Overridden from testing::Test:
   void TearDown() override {
-    root_view_and_frame_.reset();
+    root_window_and_frame_.reset();
     frame_tree_.reset();
     frame_tree_delegate_.reset();
     ApplicationTestBase::TearDown();
   }
 
   // Overridden from mojo::InterfaceFactory<mus::mojom::WindowTreeClient>:
   void Create(
       mojo::ApplicationConnection* connection,
       mojo::InterfaceRequest<mus::mojom::WindowTreeClient> request) override {
-    if (view_and_frame_) {
+    if (window_and_frame_) {
       mus::WindowTreeConnection::Create(
-          view_and_frame_.get(), request.Pass(),
+          window_and_frame_.get(), request.Pass(),
           mus::WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED);
     } else {
       mus::WindowTreeConnection::Create(
           this, request.Pass(),
           mus::WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED);
     }
   }
 
   // Overridden from mojo::InterfaceFactory<mojom::FrameClient>:
   void Create(mojo::ApplicationConnection* connection,
               mojo::InterfaceRequest<mojom::FrameClient> request) override {
-    ASSERT_TRUE(view_and_frame_);
-    view_and_frame_->Bind(request.Pass());
+    ASSERT_TRUE(window_and_frame_);
+    window_and_frame_->Bind(request.Pass());
   }
 
   scoped_ptr<TestFrameTreeDelegate> frame_tree_delegate_;
   scoped_ptr<FrameTree> frame_tree_;
-  scoped_ptr<ViewAndFrame> root_view_and_frame_;
+  scoped_ptr<WindowAndFrame> root_window_and_frame_;
 
   mus::mojom::WindowTreeHostPtr host_;
 
-  // Used to receive the most recent view manager loaded by an embed action.
+  // Used to receive the most recent window manager loaded by an embed action.
   WindowTreeConnection* most_recent_connection_;
-  // The View Manager connection held by the window manager (app running at the
-  // root view).
+  // The Window Manager connection held by the window manager (app running at
+  // the
+  // root window).
   WindowTreeConnection* window_manager_;
 
-  scoped_ptr<ViewAndFrame> view_and_frame_;
+  scoped_ptr<WindowAndFrame> window_and_frame_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(FrameTest);
 };
 
 // Verifies the FrameData supplied to the root FrameClient::OnConnect().
 TEST_F(FrameTest, RootFrameClientConnectData) {
   mojo::Array<mojom::FrameDataPtr> frames =
-      root_view_and_frame()->test_frame_client()->connect_frames();
+      root_window_and_frame()->test_frame_client()->connect_frames();
   ASSERT_EQ(1u, frames.size());
-  EXPECT_EQ(root_view_and_frame()->view()->id(), frames[0]->frame_id);
+  EXPECT_EQ(root_window_and_frame()->window()->id(), frames[0]->frame_id);
   EXPECT_EQ(0u, frames[0]->parent_id);
 }
 
 // Verifies the FrameData supplied to a child FrameClient::OnConnect().
 TEST_F(FrameTest, ChildFrameClientConnectData) {
-  scoped_ptr<ViewAndFrame> child_view_and_frame(
-      CreateChildViewAndFrame(root_view_and_frame()));
+  scoped_ptr<WindowAndFrame> child_view_and_frame(
+      CreateChildWindowAndFrame(root_window_and_frame()));
   ASSERT_TRUE(child_view_and_frame);
   // Initially created child frames don't get OnConnect().
   EXPECT_EQ(0, child_view_and_frame->test_frame_client()->connect_count());
 
-  scoped_ptr<ViewAndFrame> navigated_child_view_and_frame =
+  scoped_ptr<WindowAndFrame> navigated_child_view_and_frame =
       NavigateFrame(child_view_and_frame.get()).Pass();
 
   mojo::Array<mojom::FrameDataPtr> frames_in_child =
       navigated_child_view_and_frame->test_frame_client()->connect_frames();
-  EXPECT_EQ(child_view_and_frame->view()->id(),
-            navigated_child_view_and_frame->view()->id());
+  EXPECT_EQ(child_view_and_frame->window()->id(),
+            navigated_child_view_and_frame->window()->id());
   // We expect 2 frames. One for the root, one for the child.
   ASSERT_EQ(2u, frames_in_child.size());
   EXPECT_EQ(frame_tree()->root()->id(), frames_in_child[0]->frame_id);
   EXPECT_EQ(0u, frames_in_child[0]->parent_id);
-  EXPECT_EQ(navigated_child_view_and_frame->view()->id(),
+  EXPECT_EQ(navigated_child_view_and_frame->window()->id(),
             frames_in_child[1]->frame_id);
   EXPECT_EQ(frame_tree()->root()->id(), frames_in_child[1]->parent_id);
 }
 
 TEST_F(FrameTest, OnViewEmbeddedInFrameDisconnected) {
-  scoped_ptr<ViewAndFrame> child_view_and_frame(
-      CreateChildViewAndFrame(root_view_and_frame()));
+  scoped_ptr<WindowAndFrame> child_view_and_frame(
+      CreateChildWindowAndFrame(root_window_and_frame()));
   ASSERT_TRUE(child_view_and_frame);
 
-  scoped_ptr<ViewAndFrame> navigated_child_view_and_frame =
+  scoped_ptr<WindowAndFrame> navigated_child_view_and_frame =
       NavigateFrame(child_view_and_frame.get()).Pass();
 
   // Delete the WindowTreeConnection for the child, which should trigger
   // notification.
-  delete navigated_child_view_and_frame->view()->connection();
+  delete navigated_child_view_and_frame->window()->connection();
   ASSERT_EQ(1u, frame_tree()->root()->children().size());
   ASSERT_NO_FATAL_FAILURE(frame_tree_delegate()->WaitForFrameDisconnected(
       frame_tree()->root()->children()[0]));
   ASSERT_EQ(1u, frame_tree()->root()->children().size());
 }
 
 TEST_F(FrameTest, NotifyRemoteParentWithLoadingState) {
-  scoped_ptr<ViewAndFrame> child_view_and_frame(
-      CreateChildViewAndFrame(root_view_and_frame()));
-  uint32_t child_frame_id = child_view_and_frame->view()->id();
+  scoped_ptr<WindowAndFrame> child_view_and_frame(
+      CreateChildWindowAndFrame(root_window_and_frame()));
+  uint32_t child_frame_id = child_view_and_frame->window()->id();
 
   {
     base::RunLoop run_loop;
-    root_view_and_frame()
+    root_window_and_frame()
         ->test_frame_client()
         ->set_on_loading_state_changed_callback(run_loop.QuitClosure());
 
     child_view_and_frame->server_frame()->LoadingStateChanged(true, .5);
 
     run_loop.Run();
 
     uint32_t frame_id = 0;
     bool loading = false;
-    root_view_and_frame()
+    root_window_and_frame()
         ->test_frame_client()
         ->last_loading_state_changed_notification(&frame_id, &loading);
     EXPECT_EQ(child_frame_id, frame_id);
     EXPECT_TRUE(loading);
   }
   {
     base::RunLoop run_loop;
-    root_view_and_frame()
+    root_window_and_frame()
         ->test_frame_client()
         ->set_on_loading_state_changed_callback(run_loop.QuitClosure());
 
     ASSERT_TRUE(child_view_and_frame);
     ASSERT_TRUE(child_view_and_frame->server_frame());
 
     child_view_and_frame->server_frame()->LoadingStateChanged(false, 1);
 
     run_loop.Run();
 
     uint32_t frame_id = 0;
     bool loading = false;
-    root_view_and_frame()
+    root_window_and_frame()
         ->test_frame_client()
         ->last_loading_state_changed_notification(&frame_id, &loading);
     EXPECT_EQ(child_frame_id, frame_id);
     EXPECT_FALSE(loading);
   }
 }
 
 TEST_F(FrameTest, NotifyRemoteParentWithLoadEvent) {
-  scoped_ptr<ViewAndFrame> child_view_and_frame(
-      CreateChildViewAndFrame(root_view_and_frame()));
-  uint32_t child_frame_id = child_view_and_frame->view()->id();
+  scoped_ptr<WindowAndFrame> child_view_and_frame(
+      CreateChildWindowAndFrame(root_window_and_frame()));
+  uint32_t child_frame_id = child_view_and_frame->window()->id();
 
   base::RunLoop run_loop;
-  root_view_and_frame()
+  root_window_and_frame()
       ->test_frame_client()
       ->set_on_dispatch_load_event_callback(run_loop.QuitClosure());
 
   child_view_and_frame->server_frame()->DispatchLoadEventToParent();
 
   run_loop.Run();
 
-  uint32_t frame_id = root_view_and_frame()
+  uint32_t frame_id = root_window_and_frame()
                           ->test_frame_client()
                           ->last_dispatch_load_event_frame_id();
   EXPECT_EQ(child_frame_id, frame_id);
 }
 
 TEST_F(FrameTest, PassAlongNavigationStartTime) {
-  scoped_ptr<ViewAndFrame> child_view_and_frame(
-      CreateChildViewAndFrame(root_view_and_frame()));
+  scoped_ptr<WindowAndFrame> child_view_and_frame(
+      CreateChildWindowAndFrame(root_window_and_frame()));
   ASSERT_TRUE(child_view_and_frame);
 
   base::TimeTicks navigation_start_time = base::TimeTicks::FromInternalValue(1);
-  scoped_ptr<ViewAndFrame> navigated_child_view_and_frame =
+  scoped_ptr<WindowAndFrame> navigated_child_view_and_frame =
       NavigateFrameWithStartTime(child_view_and_frame.get(),
                                  navigation_start_time)
           .Pass();
   EXPECT_EQ(navigation_start_time,
             navigated_child_view_and_frame->test_frame_client()
                 ->last_navigation_start_time());
 }
 
 }  // namespace web_view