Revert "Revert 146000 - Split out ContentViewCore from ContentView for embedders."

content/browser/android/download_controller.cc

 // Copyright (c) 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 "content/browser/android/download_controller.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
+#include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/download/download_item_impl.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/global_request_id.h"
 #include "jni/download_controller_jni.h"
 #include "net/cookies/cookie_options.h"
@@ skipping 189 matching lines @@
 
 void DownloadController::OnPostDownloadStarted(
     WebContents* web_contents,
     DownloadItem* download_item) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   JNIEnv* env = AttachCurrentThread();
 
   // Register for updates to the DownloadItem.
   download_item->AddObserver(this);
 
-  jobject view = GetContentViewFromWebContents(web_contents);
+  jobject view = GetContentViewCoreFromWebContents(web_contents);
   if(!view) {
     // The view went away. Can't proceed.
     return;
   }
 
   Java_DownloadController_onHttpPostDownloadStarted(
       env, GetJavaObject()->Controller(env).obj(), view);
 }
 
 void DownloadController::OnDownloadUpdated(DownloadItem* item) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (item->GetState() != DownloadItem::COMPLETE)
     return;
 
   // Call onHttpPostDownloadCompleted
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jurl =
       ConvertUTF8ToJavaString(env, item->GetURL().spec());
   ScopedJavaLocalRef<jstring> jcontent_disposition =
       ConvertUTF8ToJavaString(env, item->GetContentDisposition());
   ScopedJavaLocalRef<jstring> jmime_type =
       ConvertUTF8ToJavaString(env, item->GetMimeType());
   ScopedJavaLocalRef<jstring> jpath =
       ConvertUTF8ToJavaString(env, item->GetFullPath().value());
 
-  jobject view = GetContentViewFromWebContents(item->GetWebContents());
-  if(!view) {
+  jobject view_core = GetContentViewCoreFromWebContents(item->GetWebContents());
+  if (!view_core) {
     // We can get NULL WebContents from the DownloadItem.
     return;
   }
 
   Java_DownloadController_onHttpPostDownloadCompleted(env,
-      GetJavaObject()->Controller(env).obj(), view, jurl.obj(),
+      GetJavaObject()->Controller(env).obj(), view_core, jurl.obj(),
       jcontent_disposition.obj(), jmime_type.obj(), jpath.obj(),
       item->GetReceivedBytes(), true);
 }
 
 void DownloadController::OnDownloadOpened(DownloadItem* item) {
 }
 
 jobject DownloadController::GetContentView(int render_process_id,
                                            int render_view_id) {
   RenderViewHost* render_view_host =
       RenderViewHost::FromID(render_process_id, render_view_id);
 
   if (!render_view_host)
     return NULL;
 
   WebContents* web_contents =
       render_view_host->GetDelegate()->GetAsWebContents();
 
   if (!web_contents)
     return NULL;
 
-  return GetContentViewFromWebContents(web_contents);
+  return GetContentViewCoreFromWebContents(web_contents);
 }
 
-jobject DownloadController::GetContentViewFromWebContents(
+jobject DownloadController::GetContentViewCoreFromWebContents(
     WebContents* web_contents) {
   NOTIMPLEMENTED();
   return NULL;
 }
 
 DownloadController::JavaObject* DownloadController::GetJavaObject() {
   if (!java_object_) {
     // Initialize Java DownloadController by calling
     // DownloadController.getInstance(), which will call Init()
     // if Java DownloadController is not instantiated already.
@@ skipping 18 matching lines @@
   request->extra_request_headers().GetHeader(
       net::HttpRequestHeaders::kUserAgent,
       &user_agent);
   if (!request->url_chain().empty()) {
     original_url = request->url_chain().front();
     url = request->url_chain().back();
   }
 }
 
 }  // namespace content