Rename frame classes

components/html_viewer/html_document.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 "components/html_viewer/html_document.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
@@ skipping 86 matching lines @@
                            const DeleteCallback& delete_callback,
                            HTMLFactory* factory)
     : app_refcount_(html_document_app->app_lifetime_helper()
                         ->CreateAppRefCount()),
       html_document_app_(html_document_app),
       connection_(connection),
       global_state_(global_state),
       frame_(nullptr),
       delete_callback_(delete_callback),
       factory_(factory) {
-  connection->AddService<web_view::FrameTreeClient>(this);
+  connection->AddService<web_view::mojom::FrameClient>(this);
   connection->AddService<AxProvider>(this);
   connection->AddService<mojo::ViewTreeClient>(this);
   connection->AddService<devtools_service::DevToolsAgent>(this);
   if (IsTestInterfaceEnabled())
     connection->AddService<TestHTMLViewer>(this);
 
   resource_waiter_.reset(
       new DocumentResourceWaiter(global_state_, response.Pass(), this));
 }
 
@@ skipping 165 matching lines @@
     *cached_request = request.Pass();
     GetBeforeLoadCache()->test_interface_requests.insert(cached_request);
   } else {
     test_html_viewers_.push_back(new TestHTMLViewerImpl(
         frame_->web_frame()->toWebLocalFrame(), request.Pass()));
   }
 }
 
 void HTMLDocument::Create(
     mojo::ApplicationConnection* connection,
-    mojo::InterfaceRequest<web_view::FrameTreeClient> request) {
+    mojo::InterfaceRequest<web_view::mojom::FrameClient> request) {
   if (frame_) {
-    DVLOG(1) << "Request for FrameTreeClient after one already vended.";
+    DVLOG(1) << "Request for FrameClient after one already vended.";
     return;
   }
   resource_waiter_->Bind(request.Pass());
 }
 
 void HTMLDocument::Create(
     mojo::ApplicationConnection* connection,
     mojo::InterfaceRequest<devtools_service::DevToolsAgent> request) {
   if (frame_) {
     if (frame_->devtools_agent())
       frame_->devtools_agent()->BindToRequest(request.Pass());
   } else {
     devtools_agent_request_ = request.Pass();
   }
 }
 
 void HTMLDocument::Create(
     mojo::ApplicationConnection* connection,
     mojo::InterfaceRequest<mojo::ViewTreeClient> request) {
   DCHECK(!transferable_state_.view_tree_delegate_impl);
   transferable_state_.view_tree_delegate_impl.reset(
       new ViewTreeDelegateImpl(this));
   transferable_state_.owns_view_tree_connection = true;
   mus::ViewTreeConnection::Create(
       transferable_state_.view_tree_delegate_impl.get(), request.Pass());
 }
 
 }  // namespace html_viewer