Store suggestions from Android spellchecker in spelling markers

components/spellcheck/browser/spellchecker_session_bridge_android.cc

 // Copyright 2015 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 "components/spellcheck/browser/spellchecker_session_bridge_android.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/android/jni_array.h"
@@ skipping 76 matching lines @@
 
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_SpellCheckerSessionBridge_requestTextCheck(
       env, java_object_, base::android::ConvertUTF16ToJavaString(env, text));
 }
 
 void SpellCheckerSessionBridge::ProcessSpellCheckResults(
     JNIEnv* env,
     const JavaParamRef<jobject>& jobj,
     const JavaParamRef<jintArray>& offset_array,
-    const JavaParamRef<jintArray>& length_array) {
+    const JavaParamRef<jintArray>& length_array,
+    const JavaParamRef<jobjectArray>& suggestions_array) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   std::vector<int> offsets;
   std::vector<int> lengths;
 
   base::android::JavaIntArrayToIntVector(env, offset_array, &offsets);
   base::android::JavaIntArrayToIntVector(env, length_array, &lengths);
 
   std::vector<SpellCheckResult> results;
   for (size_t i = 0; i < offsets.size(); i++) {
-    results.push_back(
-        SpellCheckResult(SpellCheckResult::SPELLING, offsets[i], lengths[i]));
+    base::android::ScopedJavaLocalRef<jobjectArray> suggestions_for_word_array(
+        env, static_cast<jobjectArray>(
+                 env->GetObjectArrayElement(suggestions_array, i)));
+    std::vector<base::string16> suggestions_for_word;
+    base::android::AppendJavaStringArrayToStringVector(
+        env, suggestions_for_word_array.obj(), &suggestions_for_word);
+    results.push_back(SpellCheckResult(SpellCheckResult::SPELLING, offsets[i],
+                                       lengths[i], suggestions_for_word));
   }
 
   content::RenderProcessHost* sender =
       content::RenderProcessHost::FromID(render_process_id_);
 
   if (sender != nullptr) {
     sender->Send(new SpellCheckMsg_RespondTextCheck(
         active_request_->route_id, active_request_->identifier,
         active_request_->text, results));
   }
@@ skipping 23 matching lines @@
   }
 }
 
 SpellCheckerSessionBridge::SpellingRequest::SpellingRequest(
     int route_id,
     int identifier,
     const base::string16& text)
     : route_id(route_id), identifier(identifier), text(text) {}
 
 SpellCheckerSessionBridge::SpellingRequest::~SpellingRequest() {}