Rename frame classes

components/html_viewer/ax_provider_apptest.cc

Index: components/html_viewer/ax_provider_apptest.cc
diff --git a/components/html_viewer/ax_provider_apptest.cc b/components/html_viewer/ax_provider_apptest.cc
index d25f3168a7e9fa77e8c64e27267994677f03a3bc..8721662e4f20cb38b3694eb7c1ee91791c2a0465 100644
--- a/components/html_viewer/ax_provider_apptest.cc
+++ b/components/html_viewer/ax_provider_apptest.cc
@@ -10,7 +10,7 @@
 #include "components/mus/public/cpp/tests/view_manager_test_base.h"
 #include "components/mus/public/cpp/view.h"
 #include "components/mus/public/cpp/view_tree_connection.h"
-#include "components/web_view/public/interfaces/frame_tree.mojom.h"
+#include "components/web_view/public/interfaces/frame.mojom.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/application/public/cpp/application_test_base.h"
 #include "net/test/spawned_test_server/spawned_test_server.h"
@@ -30,33 +30,34 @@ bool AxTreeContainsText(const Array<AxNodePtr>& tree, const String& text) {
   return false;
 }
 
-class TestFrameTreeServer : public web_view::FrameTreeServer {
+class TestFrame : public web_view::mojom::Frame {
  public:
-  TestFrameTreeServer() {}
-  ~TestFrameTreeServer() override {}
+  TestFrame() {}
+  ~TestFrame() override {}
 
-  // web_view::FrameTreeServer:
-  void PostMessageEventToFrame(uint32_t target_frame_id,
-                               web_view::HTMLMessageEventPtr event) override {}
+  // web_view::mojom::Frame:
+  void PostMessageEventToFrame(
+      uint32_t target_frame_id,
+      web_view::mojom::HTMLMessageEventPtr event) override {}
   void LoadingStateChanged(bool loading, double progress) override {}
   void TitleChanged(const mojo::String& title) override {}
   void DidCommitProvisionalLoad() override {}
   void SetClientProperty(const mojo::String& name,
                          mojo::Array<uint8_t> value) override {}
   void OnCreatedFrame(
-      mojo::InterfaceRequest<web_view::FrameTreeServer> server_request,
-      web_view::FrameTreeClientPtr client,
+      mojo::InterfaceRequest<web_view::mojom::Frame> frame_request,
+      web_view::mojom::FrameClientPtr client,
       uint32_t frame_id,
       mojo::Map<mojo::String, mojo::Array<uint8_t>> client_properties)
       override {}
-  void RequestNavigate(web_view::NavigationTargetType target_type,
+  void RequestNavigate(web_view::mojom::NavigationTargetType target_type,
                        uint32_t target_frame_id,
                        mojo::URLRequestPtr request) override {}
   void DidNavigateLocally(const mojo::String& url) override {}
   void DispatchLoadEventToParent() override {}
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(TestFrameTreeServer);
+  DISALLOW_COPY_AND_ASSIGN(TestFrame);
 };
 
 }  // namespace
@@ -84,22 +85,21 @@ TEST_F(AXProviderTest, HelloWorld) {
   mus::View* embed_view = window_manager()->CreateView();
   embed_view->Embed(tree_client.Pass());
 
-  TestFrameTreeServer frame_tree_server;
-  web_view::FrameTreeServerPtr frame_tree_server_ptr;
-  mojo::Binding<web_view::FrameTreeServer> frame_tree_server_binding(
-      &frame_tree_server);
-  frame_tree_server_binding.Bind(GetProxy(&frame_tree_server_ptr).Pass());
+  TestFrame frame;
+  web_view::mojom::FramePtr frame_ptr;
+  mojo::Binding<web_view::mojom::Frame> frame_binding(&frame);
+  frame_binding.Bind(GetProxy(&frame_ptr).Pass());
 
-  mojo::Array<web_view::FrameDataPtr> array(1u);
-  array[0] = web_view::FrameData::New().Pass();
+  mojo::Array<web_view::mojom::FrameDataPtr> array(1u);
+  array[0] = web_view::mojom::FrameData::New().Pass();
   array[0]->frame_id = embed_view->id();
   array[0]->parent_id = 0u;
 
-  web_view::FrameTreeClientPtr frame_tree_client;
-  connection->ConnectToService(&frame_tree_client);
-  frame_tree_client->OnConnect(
-      frame_tree_server_ptr.Pass(), 1u, embed_view->id(),
-      web_view::VIEW_CONNECT_TYPE_USE_NEW, array.Pass(), base::Closure());
+  web_view::mojom::FrameClientPtr frame_client;
+  connection->ConnectToService(&frame_client);
+  frame_client->OnConnect(frame_ptr.Pass(), 1u, embed_view->id(),
+                          web_view::mojom::VIEW_CONNECT_TYPE_USE_NEW,
+                          array.Pass(), base::Closure());
 
   // Connect to the AxProvider of the HTML document and get the AxTree.
   AxProviderPtr ax_provider;