Remove //chrome as an embedder of blimp.

chrome/browser/android/tab_android.cc

 // Copyright 2012 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 "chrome/browser/android/tab_android.h"
 
 #include <stddef.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/trace_event/trace_event.h"
-#include "blimp/client/public/blimp_client_context.h"
-#include "blimp/client/public/contents/blimp_contents.h"
-#include "blimp/client/public/contents/blimp_contents_view.h"
-#include "blimp/client/public/contents/blimp_navigation_controller.h"
 #include "cc/layers/layer.h"
-#include "chrome/browser/android/blimp/blimp_client_context_factory.h"
 #include "chrome/browser/android/compositor/tab_content_manager.h"
 #include "chrome/browser/android/metrics/uma_utils.h"
 #include "chrome/browser/android/offline_pages/offline_page_bridge.h"
 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h"
 #include "chrome/browser/android/offline_pages/offline_page_utils.h"
 #include "chrome/browser/android/tab_web_contents_delegate_android.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 331 matching lines @@
 
   if (favicon_driver)
     favicon_driver->AddObserver(this);
 
   synced_tab_delegate_->SetWebContents(web_contents());
 
   // Verify that the WebContents this tab represents matches the expected
   // off the record state.
   CHECK_EQ(GetProfile()->IsOffTheRecord(), incognito);
 
-  if (!blimp_contents_)
-    content_layer_->InsertChild(web_contents_->GetNativeView()->GetLayer(), 0);
-}
-
-base::android::ScopedJavaLocalRef<jobject> TabAndroid::InitBlimpContents(
-    JNIEnv* env,
-    const JavaParamRef<jobject>& obj,
-    const JavaParamRef<jobject>& j_profile,
-    jlong window_android_ptr) {
-  Profile* profile = ProfileAndroid::FromProfileAndroid(j_profile.obj());
-  DCHECK(!profile->IsOffTheRecord());
-  blimp::client::BlimpClientContext* context =
-      BlimpClientContextFactory::GetForBrowserContext(profile);
-  DCHECK(context);
-  ui::WindowAndroid* window =
-      reinterpret_cast<ui::WindowAndroid*>(window_android_ptr);
-  blimp_contents_ = context->CreateBlimpContents(window);
-  // If creating a BlimpContents failed, fall back to WebContents-based by
-  // doing an early out here.
-  if (!blimp_contents_)
-    return nullptr;
-
-  // Let's detach the layer from WebContents first, just to be sure.
-  if (web_contents_ && web_contents_->GetNativeView() &&
-      web_contents_->GetNativeView()->GetLayer()) {
-    cc::Layer* web_contents_layer = web_contents_->GetNativeView()->GetLayer();
-    if (web_contents_layer->parent() == content_layer_.get())
-      web_contents_layer->RemoveFromParent();
-  }
-
-  // Attach the layer holding the tab contents to the |content_layer_|.
-  content_layer_->InsertChild(
-      blimp_contents_->GetView()->GetNativeView()->GetLayer(), 0);
-
-  return blimp_contents_->GetJavaObject();
+  content_layer_->InsertChild(web_contents_->GetNativeView()->GetLayer(), 0);
 }
 
 void TabAndroid::UpdateDelegates(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jobject>& jweb_contents_delegate,
     const JavaParamRef<jobject>& jcontext_menu_populator) {
   ContextMenuHelper::FromWebContents(web_contents())->SetPopulator(
       jcontext_menu_populator);
   web_contents_delegate_ =
@@ skipping 105 matching lines @@
   if (!fixed_url.is_valid())
     return PAGE_LOAD_FAILED;
 
   if (!HandleNonNavigationAboutURL(fixed_url)) {
     // Record UMA "ShowHistory" here. That way it'll pick up both user
     // typing chrome://history as well as selecting from the drop down menu.
     if (fixed_url.spec() == chrome::kChromeUIHistoryURL) {
       content::RecordAction(base::UserMetricsAction("ShowHistory"));
     }
 
-    if (blimp_contents()) {
-      blimp_contents()->GetNavigationController().LoadURL(fixed_url);
-      return DEFAULT_PAGE_LOAD;
-    }
-
     content::NavigationController::LoadURLParams load_params(fixed_url);
     if (j_extra_headers) {
       load_params.extra_headers = base::android::ConvertJavaStringToUTF8(
           env,
           j_extra_headers);
     }
     if (j_post_data) {
       load_params.load_type =
           content::NavigationController::LOAD_TYPE_HTTP_POST;
       load_params.post_data =
@@ skipping 257 matching lines @@
 static void Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   TRACE_EVENT0("native", "TabAndroid::Init");
   // This will automatically bind to the Java object and pass ownership there.
   new TabAndroid(env, obj);
 }
 
 // static
 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }