Rename frame classes

components/web_view/frame_connection.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_connection.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "components/clipboard/public/interfaces/clipboard.mojom.h"
 #include "components/mus/public/interfaces/gpu.mojom.h"
@@ skipping 21 matching lines @@
     const uint32_t existing_content_handler_id,
     const FrameTreeDelegate::CanNavigateFrameCallback& callback,
     scoped_ptr<FrameConnection> connection) {
   mojo::ViewTreeClientPtr view_tree_client;
   if (!AreAppIdsEqual(existing_content_handler_id,
                       connection->GetContentHandlerID())) {
     view_tree_client = connection->GetViewTreeClient();
   }
   FrameConnection* connection_ptr = connection.get();
   callback.Run(connection_ptr->GetContentHandlerID(),
-               connection_ptr->frame_tree_client(), connection.Pass(),
+               connection_ptr->frame_client(), connection.Pass(),
                view_tree_client.Pass());
 }
 
 }  // namespace
 
 FrameConnection::FrameConnection() : application_connection_(nullptr) {
 }
 
 FrameConnection::~FrameConnection() {
 }
@@ skipping 49 matching lines @@
                         test_runner_interfaces.Pass());
 
 #if defined(OS_LINUX) && !defined(OS_ANDROID)
   mojo::Array<mojo::String> font_service_interfaces;
   font_service_interfaces.push_back(font_service::FontService::Name_);
   filter->filter.insert("mojo:font_service", font_service_interfaces.Pass());
 #endif
 
   application_connection_ = app->ConnectToApplicationWithCapabilityFilter(
       request.Pass(), filter.Pass());
-  application_connection_->ConnectToService(&frame_tree_client_);
+  application_connection_->ConnectToService(&frame_client_);
   application_connection_->AddContentHandlerIDCallback(on_got_id_callback);
 }
 
 mojo::ViewTreeClientPtr FrameConnection::GetViewTreeClient() {
   DCHECK(application_connection_);
   mojo::ViewTreeClientPtr view_tree_client;
   application_connection_->ConnectToService(&view_tree_client);
   return view_tree_client.Pass();
 }
 
 uint32_t FrameConnection::GetContentHandlerID() const {
   uint32_t content_handler_id = mojo::Shell::kInvalidContentHandlerID;
   if (!application_connection_->GetContentHandlerID(&content_handler_id))
     NOTREACHED();
   return content_handler_id;
 }
 
 }  // namespace web_view