Allow TranslateRanker to override decisions taken by heuristics.

chrome/browser/translate/chrome_translate_client.cc

 // Copyright 2014 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 "chrome/browser/translate/chrome_translate_client.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 18 matching lines @@
 #include "components/metrics/proto/translate_event.pb.h"
 #include "components/prefs/pref_service.h"
 #include "components/translate/core/browser/language_model.h"
 #include "components/translate/core/browser/language_state.h"
 #include "components/translate/core/browser/page_translated_details.h"
 #include "components/translate/core/browser/translate_accept_languages.h"
 #include "components/translate/core/browser/translate_download_manager.h"
 #include "components/translate/core/browser/translate_infobar_delegate.h"
 #include "components/translate/core/browser/translate_manager.h"
 #include "components/translate/core/browser/translate_prefs.h"
+#include "components/translate/core/browser/translate_ranker.h"
 #include "components/translate/core/common/language_detection_details.h"
 #include "components/variations/service/variations_service.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "url/gurl.h"
 
 namespace {
 
 metrics::TranslateEventProto::EventType BubbleResultToTranslateEvent(
@@ skipping 168 matching lines @@
 #endif
 
   // Bubble UI.
   if (step == translate::TRANSLATE_STEP_BEFORE_TRANSLATE) {
     // TODO(droger): Move this logic out of UI code.
     GetLanguageState().SetTranslateEnabled(true);
     // In the new UI, continue offering translation after the user navigates to
     // another page.
     if (!base::FeatureList::IsEnabled(translate::kTranslateUI2016Q2) &&
         !GetLanguageState().HasLanguageChanged()) {
-      translate_manager_->RecordTranslateEvent(
-          metrics::TranslateEventProto::MATCHES_PREVIOUS_LANGUAGE);
-      return;
+      if (translate::TranslateRanker::IsDecisionOverrideEnabled()) {
+        translate_manager_->RecordDecisionOverride(
+            metrics::TranslateEventProto::MATCHES_PREVIOUS_LANGUAGE);
+        DVLOG(3) << "Overriding decision MATCHES_PREVIOUS_LANGUAGE.";
+      } else {
+        translate_manager_->RecordTranslateEvent(
+            metrics::TranslateEventProto::MATCHES_PREVIOUS_LANGUAGE);
+        return;
+      }
     }
 
     if (!triggered_from_menu &&
         GetTranslatePrefs()->IsTooOftenDenied(source_language)) {
-      translate_manager_->RecordTranslateEvent(
-          metrics::TranslateEventProto::LANGUAGE_DISABLED_BY_AUTO_BLACKLIST);
-      return;
+      if (translate::TranslateRanker::IsDecisionOverrideEnabled()) {

[groby-ooo-7-16, 2017/02/23 19:08:06]

You could filter out the common code into a helper, which would result in both
instances becoming something like

if (DecisionOverride(MATCHES_PREVIOUS_LANGUAGE))
  return;

making things somewhat more readable.

[hamelphi, 2017/03/01 00:40:03]

Done. I moved the logging logic to TranslateManager.

+        translate_manager_->RecordDecisionOverride(
+            metrics::TranslateEventProto::LANGUAGE_DISABLED_BY_AUTO_BLACKLIST);
+        DVLOG(3) << "Overriding decision LANGUAGE_DISABLED_BY_AUTO_BLACKLIST.";
+      } else {
+        translate_manager_->RecordTranslateEvent(
+            metrics::TranslateEventProto::LANGUAGE_DISABLED_BY_AUTO_BLACKLIST);
+        return;
+      }
     }
   }
+
   ShowTranslateBubbleResult result = ShowBubble(step, error_type);
   if (result != ShowTranslateBubbleResult::SUCCESS &&
       step == translate::TRANSLATE_STEP_BEFORE_TRANSLATE) {
     translate_manager_->RecordTranslateEvent(
         BubbleResultToTranslateEvent(result));
   }
 }
 
 translate::TranslateDriver* ChromeTranslateClient::GetTranslateDriver() {
   return &translate_driver_;
@@ skipping 124 matching lines @@
       return ShowTranslateBubbleResult::SUCCESS;
   }
 
   return TranslateBubbleFactory::Show(browser->window(), web_contents(), step,
                                       error_type);
 #else
   NOTREACHED();
   return ShowTranslateBubbleResult::SUCCESS;
 #endif
 }