Add a full Blimp integration test.

blimp/client/core/contents/blimp_contents_impl.cc

 // Copyright 2016 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 "blimp/client/core/contents/blimp_contents_impl.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/supports_user_data.h"
-#include "blimp/client/core/contents/blimp_contents_view.h"
 #include "blimp/client/core/contents/tab_control_feature.h"
 #include "blimp/client/public/contents/blimp_contents_observer.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(OS_ANDROID)
 #include "blimp/client/core/contents/android/blimp_contents_impl_android.h"
 #endif  // OS_ANDROID
 
 namespace blimp {
 namespace client {
@@ skipping 13 matching lines @@
     NavigationFeature* navigation_feature,
     RenderWidgetFeature* render_widget_feature,
     TabControlFeature* tab_control_feature)
     : navigation_controller_(id, this, navigation_feature),
       compositor_manager_(id, render_widget_feature, compositor_deps),
       id_(id),
       ime_feature_(ime_feature),
       window_(window),
       tab_control_feature_(tab_control_feature) {
   blimp_contents_view_ =
-      BlimpContentsView::Create(this, compositor_manager_.layer());
+      BlimpContentsViewImpl::Create(this, compositor_manager_.layer());
   ime_feature_->set_delegate(blimp_contents_view_->GetImeDelegate());
 }
 
 BlimpContentsImpl::~BlimpContentsImpl() {
   FOR_EACH_OBSERVER(BlimpContentsObserver, observers_, BlimpContentsDying());
   ime_feature_->set_delegate(nullptr);
 }
 
 #if defined(OS_ANDROID)
 
@@ skipping 23 matching lines @@
 }
 
 void BlimpContentsImpl::AddObserver(BlimpContentsObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void BlimpContentsImpl::RemoveObserver(BlimpContentsObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
-gfx::NativeView BlimpContentsImpl::GetNativeView() {
-  return blimp_contents_view_->GetNativeView();
+BlimpContentsViewImpl* BlimpContentsImpl::GetView() {
+  return blimp_contents_view_.get();
 }
 
 void BlimpContentsImpl::Show() {
   compositor_manager_.SetVisible(true);
   UMA_HISTOGRAM_BOOLEAN("Blimp.Tab.Visible", true);
 }
 
 void BlimpContentsImpl::Hide() {
   compositor_manager_.SetVisible(false);
   UMA_HISTOGRAM_BOOLEAN("Blimp.Tab.Visible", false);
 }
 
 bool BlimpContentsImpl::HasObserver(BlimpContentsObserver* observer) {
   return observers_.HasObserver(observer);
 }
 
 void BlimpContentsImpl::OnNavigationStateChanged() {
   FOR_EACH_OBSERVER(BlimpContentsObserver, observers_,
                     OnNavigationStateChanged());
 }
 
 void BlimpContentsImpl::OnLoadingStateChanged(bool loading) {
   FOR_EACH_OBSERVER(BlimpContentsObserver, observers_,
                     OnLoadingStateChanged(loading));
 }
 
+void BlimpContentsImpl::OnPageLoadingStateChanged(bool loading) {
+  FOR_EACH_OBSERVER(BlimpContentsObserver, observers_,
+                    OnPageLoadingStateChanged(loading));
+}
+
 void BlimpContentsImpl::SetSizeAndScale(const gfx::Size& size,
                                         float device_pixel_ratio) {
   tab_control_feature_->SetSizeAndScale(size, device_pixel_ratio);
 }
 
-BlimpContentsView* BlimpContentsImpl::GetBlimpContentsView() {
-  return blimp_contents_view_.get();
-}
-
 }  // namespace client
 }  // namespace blimp