Refactor MHTMLGenerator to allow getting sending the data to a file descriptor.

android_webview/native/aw_contents.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 "android_webview/native/aw_contents.h"
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_main_parts.h"
 #include "android_webview/browser/gpu_memory_buffer_factory_impl.h"
 #include "android_webview/browser/in_process_view_renderer.h"
@@ skipping 284 matching lines @@
       env,
       ConvertUTF8ToJavaString(env, path.AsUTF8Unsafe()).obj(),
       size, callback->obj());
 }
 }  // namespace
 
 void AwContents::GenerateMHTML(JNIEnv* env, jobject obj,
                                jstring jpath, jobject callback) {
   ScopedJavaGlobalRef<jobject>* j_callback = new ScopedJavaGlobalRef<jobject>();
   j_callback->Reset(env, callback);
-  web_contents_->GenerateMHTML(
-      base::FilePath(ConvertJavaStringToUTF8(env, jpath)),
-      base::Bind(&GenerateMHTMLCallback, base::Owned(j_callback)));
+  base::FilePath target_path(ConvertJavaStringToUTF8(env, jpath));
+  web_contents_->SaveMHTML(
+      target_path,
+      base::Bind(&GenerateMHTMLCallback, path, base::Owned(j_callback)));

[mkosiba (inactive), 2013/08/28 10:34:37]

looks like this should be taget_path instead of path

[qsr, 2013/08/28 11:21:33]

 Yep... Thanks and done.

 }
 
 void AwContents::PerformLongClick() {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return;
 
   Java_AwContents_performLongClick(env, obj.obj());
 }
@@ skipping 456 matching lines @@
       browser_view_renderer_->CapturePicture(width, height)));
 }
 
 void AwContents::EnableOnNewPicture(JNIEnv* env,
                                     jobject obj,
                                     jboolean enabled) {
   browser_view_renderer_->EnableOnNewPicture(enabled);
 }
 
 }  // namespace android_webview