Check |errorCode| of translate.js and notify to Browser

components/translate/content/renderer/translate_helper.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 "components/translate/content/renderer/translate_helper.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 42 matching lines @@
 // The delay we wait in milliseconds before checking whether the translation has
 // finished.
 const int kTranslateStatusCheckDelayMs = 400;
 
 // Language name passed to the Translate element for it to detect the language.
 const char kAutoDetectionLanguage[] = "auto";
 
 // Isolated world sets following content-security-policy.
 const char kContentSecurityPolicy[] = "script-src 'self' 'unsafe-eval'";
 
+// Converts the error value returned by 'cr.googleTranslate.errorCode' to
+// TranslateErrors::Type.
+translate::TranslateErrors::Type ErrorCodeToTranslateErrorType(
+    int64_t error_code) {
+  return static_cast<translate::TranslateErrors::Type>(error_code);
+}
+
 }  // namespace
 
 namespace translate {
 
 ////////////////////////////////////////////////////////////////////////////////
 // TranslateHelper, public:
 TranslateHelper::TranslateHelper(content::RenderFrame* render_frame,
                                  int world_id,
                                  const std::string& extension_scheme)
     : content::RenderFrameObserver(render_frame),
@@ skipping 172 matching lines @@
   WebScriptSource source = WebScriptSource(WebString::FromASCII(script));
   main_frame->ExecuteScriptInIsolatedWorld(world_id_, &source, 1, &results);
   if (results.size() != 1 || results[0].IsEmpty() || !results[0]->IsNumber()) {
     NOTREACHED();
     return 0.0;
   }
 
   return results[0]->NumberValue();
 }
 
+int64_t TranslateHelper::ExecuteScriptAndGetIntegerResult(
+    const std::string& script,
+    int64_t fallback) {
+  WebLocalFrame* main_frame = render_frame()->GetWebFrame();
+  if (!main_frame)
+    return fallback;
+
+  v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
+  WebVector<v8::Local<v8::Value>> results;
+  WebScriptSource source = WebScriptSource(WebString::FromASCII(script));
+  main_frame->ExecuteScriptInIsolatedWorld(world_id_, &source, 1, &results);
+  if (results.size() != 1 || results[0].IsEmpty() || !results[0]->IsNumber()) {
+    NOTREACHED();
+    return fallback;
+  }
+
+  return results[0]->IntegerValue();
+}
+
 // mojom::Page implementations.
 void TranslateHelper::Translate(const std::string& translate_script,
                                 const std::string& source_lang,
                                 const std::string& target_lang,
                                 TranslateCallback callback) {
   WebLocalFrame* main_frame = render_frame()->GetWebFrame();
   if (!main_frame) {
     // Cancelled.
     std::move(callback).Run(true, source_lang, target_lang,
                             TranslateErrors::NONE);
@@ skipping 53 matching lines @@
   CancelPendingTranslation();
 
   ExecuteScript("cr.googleTranslate.revert()");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TranslateHelper, private:
 void TranslateHelper::CheckTranslateStatus() {
   // First check if there was an error.
   if (HasTranslationFailed()) {
-    // TODO(toyoshim): Check |errorCode| of translate.js and notify it here.
-    NotifyBrowserTranslationFailed(TranslateErrors::TRANSLATION_ERROR);
+    int64_t error_code = ExecuteScriptAndGetIntegerResult(
+        "cr.googleTranslate.errorCode",
+        static_cast<int>(TranslateErrors::TRANSLATION_ERROR));
+    NotifyBrowserTranslationFailed(ErrorCodeToTranslateErrorType(error_code));

[Takashi Toyoshima, 2017/06/14 04:00:02]

Probably it's consistent to use static_cast<TranslateErrors> directly here.

Because you already use static_cast<int> for converting TranslateErros to
errorCode. There is no reason to do the reversed conversion in a different way.

[Gaja, 2017/06/14 06:53:11]

Acknowledged. Ok, this seems better.

     return;  // There was an error.
   }
 
   if (HasTranslationFinished()) {
     std::string actual_source_lang;
     // Translation was successfull, if it was auto, retrieve the source
     // language the Translate Element detected.
     if (source_lang_ == kAutoDetectionLanguage) {
       actual_source_lang = GetOriginalPageLanguage();
       if (actual_source_lang.empty()) {
@@ skipping 84 matching lines @@
   binding_.Close();
   translate_callback_pending_.Reset();
   CancelPendingTranslation();
 }
 
 void TranslateHelper::OnDestruct() {
   delete this;
 }
 
 }  // namespace translate