Upstream latest DownloadController changes for android.

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"
@@ skipping 271 matching lines @@
 
   return GetContentViewCoreFromWebContents(web_contents);
 }
 
 ScopedJavaLocalRef<jobject>
     DownloadController::GetContentViewCoreFromWebContents(
     WebContents* web_contents) {
   if (!web_contents)
     return ScopedJavaLocalRef<jobject>();
 
-  NOTIMPLEMENTED();
-  return ScopedJavaLocalRef<jobject>();
+  ContentViewCore* view_core = web_contents->GetContentNativeView();
+  return view_core ? view_core->GetJavaObject() :
+      ScopedJavaLocalRef<jobject>();
 }
 
 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.
     JNIEnv* env = AttachCurrentThread();
     ScopedJavaLocalRef<jclass> clazz =
         GetClass(env, kDownloadControllerClassPathName);
     jmethodID get_instance = GetStaticMethodID(env, clazz, "getInstance",
         "()Lorg/chromium/content/browser/DownloadController;");
     ScopedJavaLocalRef<jobject> jobj(env,
         env->CallStaticObjectMethod(clazz.obj(), get_instance));
     CheckException(env);
   }
 
   DCHECK(java_object_);
   return java_object_;
 }
 
 DownloadController::DownloadInfoAndroid::DownloadInfoAndroid(
     net::URLRequest* request) {
   request->GetResponseHeaderByName("content-disposition", &content_disposition);
-  request->GetResponseHeaderByName("mime-type", &original_mime_type);
+  request->GetMimeType(&original_mime_type);
   request->extra_request_headers().GetHeader(
       net::HttpRequestHeaders::kUserAgent, &user_agent);
   GURL referer_url(request->GetSanitizedReferrer());
   if (referer_url.is_valid())
     referer = referer_url.spec();
   if (!request->url_chain().empty()) {
     original_url = request->url_chain().front();
     url = request->url_chain().back();
   }
 }
 
 DownloadController::DownloadInfoAndroid::~DownloadInfoAndroid() {}
 
 }  // namespace content