using ulp to improve TranslateManager GetTargetLanguage() and InitiateTranslation()

components/translate/core/browser/translate_browser_metrics_unittest.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 "components/translate/core/browser/translate_browser_metrics.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/metrics/histogram.h"
@@ skipping 22 matching lines @@
                              int expected_disabled_by_switch,
                              int expected_disabled_by_config,
                              int expected_disabled_by_build,
                              int expected_language_is_not_supported,
                              int expected_mime_type_is_not_supported,
                              int expected_url_is_not_supported,
                              int expected_similar_languages,
                              int expected_accept_languages,
                              int expected_auto_by_config,
                              int expected_auto_by_link,
+                             int expected_language_in_ulp,
                              int expected_show_infobar) {
     Snapshot();
 
     EXPECT_EQ(expected_disabled_by_prefs,
               GetCountWithoutSnapshot(translate::TranslateBrowserMetrics::
                                           INITIATION_STATUS_DISABLED_BY_PREFS));
     EXPECT_EQ(
         expected_disabled_by_switch,
         GetCountWithoutSnapshot(translate::TranslateBrowserMetrics::
                                     INITIATION_STATUS_DISABLED_BY_SWITCH));
@@ skipping 22 matching lines @@
                                           INITIATION_STATUS_SIMILAR_LANGUAGES));
     EXPECT_EQ(expected_accept_languages,
               GetCountWithoutSnapshot(translate::TranslateBrowserMetrics::
                                           INITIATION_STATUS_ACCEPT_LANGUAGES));
     EXPECT_EQ(expected_auto_by_config,
               GetCountWithoutSnapshot(translate::TranslateBrowserMetrics::
                                           INITIATION_STATUS_AUTO_BY_CONFIG));
     EXPECT_EQ(expected_auto_by_link,
               GetCountWithoutSnapshot(translate::TranslateBrowserMetrics::
                                           INITIATION_STATUS_AUTO_BY_LINK));
+    EXPECT_EQ(expected_language_in_ulp,
+              GetCountWithoutSnapshot(translate::TranslateBrowserMetrics::
+                                          INITIATION_STATUS_LANGUAGE_IN_ULP));
     EXPECT_EQ(expected_show_infobar,
               GetCountWithoutSnapshot(translate::TranslateBrowserMetrics::
                                           INITIATION_STATUS_SHOW_INFOBAR));
   }
 
   HistogramBase::Count GetTotalCount() {
     Snapshot();
     if (!samples_.get())
       return 0;
     HistogramBase::Count count = samples_->TotalCount();
@@ skipping 30 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(MetricsRecorder);
 };
 
 }  // namespace
 
 TEST(TranslateBrowserMetricsTest, ReportInitiationStatus) {
   MetricsRecorder recorder(translate::TranslateBrowserMetrics::GetMetricsName(
       translate::TranslateBrowserMetrics::UMA_INITIATION_STATUS));
 
-  recorder.CheckInitiationStatus(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+  recorder.CheckInitiationStatus(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
   translate::TranslateBrowserMetrics::ReportInitiationStatus(
       translate::TranslateBrowserMetrics::INITIATION_STATUS_DISABLED_BY_PREFS);
-  recorder.CheckInitiationStatus(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+  recorder.CheckInitiationStatus(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
   translate::TranslateBrowserMetrics::ReportInitiationStatus(
       translate::TranslateBrowserMetrics::INITIATION_STATUS_DISABLED_BY_SWITCH);
-  recorder.CheckInitiationStatus(1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+  recorder.CheckInitiationStatus(1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
   translate::TranslateBrowserMetrics::ReportInitiationStatus(
       translate::TranslateBrowserMetrics::INITIATION_STATUS_DISABLED_BY_CONFIG);
-  recorder.CheckInitiationStatus(1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+  recorder.CheckInitiationStatus(1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
   translate::TranslateBrowserMetrics::ReportInitiationStatus(
       translate::TranslateBrowserMetrics::INITIATION_STATUS_DISABLED_BY_KEY);
-  recorder.CheckInitiationStatus(1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0);
+  recorder.CheckInitiationStatus(1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0);
   translate::TranslateBrowserMetrics::ReportInitiationStatus(
       translate::TranslateBrowserMetrics::
           INITIATION_STATUS_LANGUAGE_IS_NOT_SUPPORTED);
-  recorder.CheckInitiationStatus(1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0);
+  recorder.CheckInitiationStatus(1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0);
   translate::TranslateBrowserMetrics::ReportInitiationStatus(
       translate::TranslateBrowserMetrics::
           INITIATION_STATUS_MIME_TYPE_IS_NOT_SUPPORTED);
-  recorder.CheckInitiationStatus(1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0);
+  recorder.CheckInitiationStatus(1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0);
   translate::TranslateBrowserMetrics::ReportInitiationStatus(
       translate::TranslateBrowserMetrics::
           INITIATION_STATUS_URL_IS_NOT_SUPPORTED);
-  recorder.CheckInitiationStatus(1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0);
+  recorder.CheckInitiationStatus(1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0);
   translate::TranslateBrowserMetrics::ReportInitiationStatus(
       translate::TranslateBrowserMetrics::INITIATION_STATUS_SIMILAR_LANGUAGES);
-  recorder.CheckInitiationStatus(1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0);
+  recorder.CheckInitiationStatus(1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0);
   translate::TranslateBrowserMetrics::ReportInitiationStatus(
       translate::TranslateBrowserMetrics::INITIATION_STATUS_ACCEPT_LANGUAGES);
-  recorder.CheckInitiationStatus(1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0);
+  recorder.CheckInitiationStatus(1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0);
   translate::TranslateBrowserMetrics::ReportInitiationStatus(
       translate::TranslateBrowserMetrics::INITIATION_STATUS_AUTO_BY_CONFIG);
-  recorder.CheckInitiationStatus(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0);
+  recorder.CheckInitiationStatus(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0);
   translate::TranslateBrowserMetrics::ReportInitiationStatus(
       translate::TranslateBrowserMetrics::INITIATION_STATUS_AUTO_BY_LINK);
-  recorder.CheckInitiationStatus(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0);
+  recorder.CheckInitiationStatus(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0);
+  translate::TranslateBrowserMetrics::ReportInitiationStatus(

[groby-ooo-7-16, 2016/08/02 00:38:20]

I really don't think this entire test makes sense - it's testing that the UMA
reporting macro works. (Sure, one or two tests, but you don't need full coverage
here)

[ftang, 2016/08/03 02:01:17]

What do you suggest me to do wi this? Not making change to this file?

[groby-ooo-7-16, 2016/08/04 02:33:42]

Yes, I really think we can skip this. It's a lot of bookkeeping, and I don't see
any potential errors uncovered by this.

+      translate::TranslateBrowserMetrics::INITIATION_STATUS_LANGUAGE_IN_ULP);
+  recorder.CheckInitiationStatus(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0);
   translate::TranslateBrowserMetrics::ReportInitiationStatus(
       translate::TranslateBrowserMetrics::INITIATION_STATUS_SHOW_INFOBAR);
-  recorder.CheckInitiationStatus(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1);
+  recorder.CheckInitiationStatus(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1);
 }
 
 TEST(TranslateBrowserMetricsTest, ReportLanguageDetectionError) {
   MetricsRecorder recorder(translate::TranslateBrowserMetrics::GetMetricsName(
       translate::TranslateBrowserMetrics::UMA_LANGUAGE_DETECTION_ERROR));
   EXPECT_EQ(0, recorder.GetTotalCount());
   translate::TranslateBrowserMetrics::ReportLanguageDetectionError();
   EXPECT_EQ(1, recorder.GetTotalCount());
 
 }
@@ skipping 23 matching lines @@
   const int ENGLISH = 25966;
 
   MetricsRecorder recorder(translate::TranslateBrowserMetrics::GetMetricsName(
       translate::TranslateBrowserMetrics::
           UMA_UNSUPPORTED_LANGUAGE_AT_INITIATION));
   EXPECT_EQ(0, recorder.GetTotalCount());
   translate::TranslateBrowserMetrics::ReportUnsupportedLanguageAtInitiation(
       "en");
   EXPECT_EQ(1, recorder.GetCount(ENGLISH));
 }