Add WebView.saveWebArchive support to android_webview.

android_webview/native/aw_contents.cc

Index: android_webview/native/aw_contents.cc
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
index 9984b1981bca19777a04ad8847e3f62428d071b8..d53daf81db86b568ae8d27d041549e61d6808da6 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/native/aw_contents.cc
@@ -99,10 +99,31 @@ void DocumentHasImagesCallback(ScopedJavaGlobalRef<jobject>* message,
 }  // namespace
 
 void AwContents::DocumentHasImages(JNIEnv* env, jobject obj, jobject message) {
+  ScopedJavaGlobalRef<jobject>* j_message = new ScopedJavaGlobalRef<jobject>();

[benm (inactive), 2012/09/19 14:06:52]

did you mean to change this here?

[Ted C, 2012/09/19 16:53:22]

Yeah, when looking at refactoring the code below, I noticed that the
ScopedJavaLocalRef was there as a requirement for the constructor of the global
ref.  A few of us found it confusing so I thought I would be more explicit and
avoid creating it at all.  We already loose the local ref from message
automatically when we return from this method, so there was no need for the
scoped version.

+  j_message->Reset(env, message);
   render_view_host_ext_->DocumentHasImages(
-      base::Bind(&DocumentHasImagesCallback,
-                 base::Owned(new ScopedJavaGlobalRef<jobject>(
-                    ScopedJavaLocalRef<jobject>(env, message)))));
+      base::Bind(&DocumentHasImagesCallback, base::Owned(j_message)));
+}
+
+namespace {
+void GenerateMHTMLCallback(ScopedJavaGlobalRef<jobject>* callback,
+                           const FilePath& path, int64 size) {
+  JNIEnv* env = AttachCurrentThread();
+  // Android files are UTF8, so the path conversion below is safe.
+  Java_AwContents_generateMHTMLCallback(
+      env,
+      base::android::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);
+  contents_container_->GetWebContents()->GenerateMHTML(
+      FilePath(base::android::ConvertJavaStringToUTF8(env, jpath)),
+      base::Bind(&GenerateMHTMLCallback, base::Owned(j_callback)));
 }
 
 void AwContents::onReceivedHttpAuthRequest(