Rename frame classes

components/html_viewer/document_resource_waiter.h

Index: components/html_viewer/document_resource_waiter.h
diff --git a/components/html_viewer/document_resource_waiter.h b/components/html_viewer/document_resource_waiter.h
index 123aa7bb07c00902c444b5ed5766e7adaa928fd4..31d14cdbc0193afe6e40d3b9d1ba3be728bfd100 100644
--- a/components/html_viewer/document_resource_waiter.h
+++ b/components/html_viewer/document_resource_waiter.h
@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "components/html_viewer/html_frame_tree_manager_observer.h"
 #include "components/mus/public/cpp/view_observer.h"
-#include "components/web_view/public/interfaces/frame_tree.mojom.h"
+#include "components/web_view/public/interfaces/frame.mojom.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
 
@@ -24,8 +24,8 @@ class GlobalState;
 
 // DocumentResourceWaiter waits for the necessary resources needed to load an
 // HTMLDocument. Once ready it calls to HTMLDocument::Load(). Once ready it is
-// assumed HTMLDocument will call back for the FrameTreeClient and FrameData.
-class DocumentResourceWaiter : public web_view::FrameTreeClient,
+// assumed HTMLDocument will call back for the FrameClient and FrameData.
+class DocumentResourceWaiter : public web_view::mojom::FrameClient,
                                public HTMLFrameTreeManagerObserver,
                                public mus::ViewObserver {
  public:
@@ -35,13 +35,13 @@ class DocumentResourceWaiter : public web_view::FrameTreeClient,
   ~DocumentResourceWaiter() override;
 
   // Releases all the resources that have been accumulated.
-  void Release(mojo::InterfaceRequest<web_view::FrameTreeClient>*
-                   frame_tree_client_request,
-               web_view::FrameTreeServerPtr* frame_tree_server,
-               mojo::Array<web_view::FrameDataPtr>* frame_data,
+  void Release(mojo::InterfaceRequest<web_view::mojom::FrameClient>*
+                   frame_client_request,
+               web_view::mojom::FramePtr* frame,
+               mojo::Array<web_view::mojom::FrameDataPtr>* frame_data,
                uint32_t* view_id,
                uint32_t* change_id,
-               web_view::ViewConnectType* view_connect_type,
+               web_view::mojom::ViewConnectType* view_connect_type,
                OnConnectCallback* on_connect_callback);
 
   uint32_t change_id() const { return change_id_; }
@@ -54,28 +54,28 @@ class DocumentResourceWaiter : public web_view::FrameTreeClient,
   void SetRoot(mus::View* root);
   mus::View* root() { return root_; }
 
-  void Bind(mojo::InterfaceRequest<web_view::FrameTreeClient> request);
+  void Bind(mojo::InterfaceRequest<web_view::mojom::FrameClient> request);
 
  private:
   // Updates |is_ready_|, and if ready starts the Load() in the document.
   void UpdateIsReady();
 
-  // web_view::FrameTreeClient:
-  void OnConnect(web_view::FrameTreeServerPtr server,
+  // web_view::mojom::FrameClient:
+  void OnConnect(web_view::mojom::FramePtr frame,
                  uint32_t change_id,
                  uint32_t view_id,
-                 web_view::ViewConnectType view_connect_type,
-                 mojo::Array<web_view::FrameDataPtr> frame_data,
+                 web_view::mojom::ViewConnectType view_connect_type,
+                 mojo::Array<web_view::mojom::FrameDataPtr> frame_data,
                  const OnConnectCallback& callback) override;
   void OnFrameAdded(uint32_t change_id,
-                    web_view::FrameDataPtr frame_data) override;
+                    web_view::mojom::FrameDataPtr frame_data) override;
   void OnFrameRemoved(uint32_t change_id, uint32_t frame_id) override;
   void OnFrameClientPropertyChanged(uint32_t frame_id,
                                     const mojo::String& name,
                                     mojo::Array<uint8_t> new_value) override;
   void OnPostMessageEvent(uint32_t source_frame_id,
                           uint32_t target_frame_id,
-                          web_view::HTMLMessageEventPtr event) override;
+                          web_view::mojom::HTMLMessageEventPtr event) override;
   void OnWillNavigate() override;
   void OnFrameLoadingStateChanged(uint32_t frame_id, bool loading) override;
   void OnDispatchFrameLoadEvent(uint32_t frame_id) override;
@@ -95,17 +95,16 @@ class DocumentResourceWaiter : public web_view::FrameTreeClient,
   HTMLDocument* document_;
   mojo::URLResponsePtr response_;
   mus::View* root_;
-  web_view::FrameTreeServerPtr server_;
-  mojo::Array<web_view::FrameDataPtr> frame_data_;
+  web_view::mojom::FramePtr frame_;
+  mojo::Array<web_view::mojom::FrameDataPtr> frame_data_;
   uint32_t change_id_;
   uint32_t view_id_;
-  web_view::ViewConnectType view_connect_type_;
+  web_view::mojom::ViewConnectType view_connect_type_;
   OnConnectCallback on_connect_callback_;
 
-  // Once we get OnConnect() we unbind |frame_tree_client_binding_| and put it
-  // here.
-  mojo::InterfaceRequest<web_view::FrameTreeClient> frame_tree_client_request_;
-  mojo::Binding<web_view::FrameTreeClient> frame_tree_client_binding_;
+  // Once we get OnConnect() we unbind |frame_client_binding_| and put it here.
+  mojo::InterfaceRequest<web_view::mojom::FrameClient> frame_client_request_;
+  mojo::Binding<web_view::mojom::FrameClient> frame_client_binding_;
 
   bool is_ready_;