[LanguageDetection] Rename model elements of LanguageDetectionDetails.

This is a global replace of: /cld_language/model_detected_language /is_cld_reliable/is_model_reliable Bug: 1157983 Change-Id: I9471600db6ae3221dd63fa92ee30d8c093748b20 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2587620 Auto-Submit: Michael Crouse <mcrouse@chromium.org> Reviewed-by: Donn Denman <donnd@chromium.org> Reviewed-by: Jonathan Metzman <metzman@chromium.org> Reviewed-by: Daniel Cheng <dcheng@chromium.org> Reviewed-by: Trevor Perrier <perrier@chromium.org> Reviewed-by: Scott Little <sclittle@chromium.org> Commit-Queue: Daniel Cheng <dcheng@chromium.org> Cr-Commit-Position: refs/heads/master@{#836839}
Denger-Network · Dec 14, 2020 · 0ebf0d5 · 0ebf0d5
1 parent 5d4a8a0
commit 0ebf0d5
Show file tree

Hide file tree

Showing 21 changed files with 145 additions and 153 deletions.
diff --git a/chrome/browser/android/contextualsearch/contextual_search_context.cc b/chrome/browser/android/contextualsearch/contextual_search_context.cc
@@ -190,14 +190,14 @@ ContextualSearchContext::GetTranslationLanguages() const {
 
 std::string ContextualSearchContext::GetReliableLanguage(
     const base::string16& contents) const {
-  std::string content_language;
-  std::string html_lang;
-  std::string cld_language;
-  bool is_cld_reliable;
+  std::string model_detected_language;
+  bool is_model_reliable;
   std::string language = translate::DeterminePageLanguage(
-      content_language, html_lang, contents, &cld_language, &is_cld_reliable);
+      /*content_language=*/std::string(),
+      /*html_lang=*/std::string(), contents, &model_detected_language,
+      &is_model_reliable);
   // Make sure we return an empty string when unreliable or an unknown result.
-  if (!is_cld_reliable || language == translate::kUnknownLanguageCode)
+  if (!is_model_reliable || language == translate::kUnknownLanguageCode)
     language = "";
   return language;
 }

diff --git a/components/language/ios/browser/ios_language_detection_tab_helper.mm b/components/language/ios/browser/ios_language_detection_tab_helper.mm
@@ -43,8 +43,8 @@
 void IOSLanguageDetectionTabHelper::OnLanguageDetermined(
     const translate::LanguageDetectionDetails& details) {
   // Update language histogram.
-  if (url_language_histogram_ && details.is_cld_reliable) {
-    url_language_histogram_->OnPageVisited(details.cld_language);
+  if (url_language_histogram_ && details.is_model_reliable) {
+    url_language_histogram_->OnPageVisited(details.model_detected_language);
   }
 
   for (auto& observer : observer_list_) {

diff --git a/...onents/language/ios/browser/ios_language_detection_tab_helper_observer_bridge_unittest.mm b/...onents/language/ios/browser/ios_language_detection_tab_helper_observer_bridge_unittest.mm
@@ -77,8 +77,8 @@ - (void)iOSLanguageDetectionTabHelper:
 
   translate::LanguageDetectionDetails details;
   details.content_language = kContentLanguage;
-  details.cld_language = kUndefined;
-  details.is_cld_reliable = true;
+  details.model_detected_language = kUndefined;
+  details.is_model_reliable = true;
   details.has_notranslate = true;
   details.html_root_language = kRootLanguage;
   details.adopted_language = kAdoptedLanguage;
@@ -89,8 +89,8 @@ - (void)iOSLanguageDetectionTabHelper:
   const translate::LanguageDetectionDetails& forwarded_details =
       observer().languageDetectionDetails;
   EXPECT_EQ(kContentLanguage, forwarded_details.content_language);
-  EXPECT_EQ(kUndefined, forwarded_details.cld_language);
-  EXPECT_TRUE(forwarded_details.is_cld_reliable);
+  EXPECT_EQ(kUndefined, forwarded_details.model_detected_language);
+  EXPECT_TRUE(forwarded_details.is_model_reliable);
   EXPECT_TRUE(forwarded_details.has_notranslate);
   EXPECT_EQ(kRootLanguage, forwarded_details.html_root_language);
   EXPECT_EQ(kAdoptedLanguage, forwarded_details.adopted_language);

diff --git a/components/services/language_detection/language_detection_service_impl.cc b/components/services/language_detection/language_detection_service_impl.cc
@@ -20,10 +20,10 @@ LanguageDetectionServiceImpl::~LanguageDetectionServiceImpl() = default;
 void LanguageDetectionServiceImpl::DetermineLanguage(
     const ::base::string16& text,
     DetermineLanguageCallback callback) {
-  bool is_cld_reliable = false;
-  std::string cld_language = translate::DetermineTextLanguage(
-      base::UTF16ToUTF8(text), &is_cld_reliable);
-  std::move(callback).Run(cld_language, is_cld_reliable);
+  bool is_model_reliable = false;
+  std::string model_detected_language = translate::DetermineTextLanguage(
+      base::UTF16ToUTF8(text), &is_model_reliable);
+  std::move(callback).Run(model_detected_language, is_model_reliable);
 }
 
 }  // namespace language_detection
diff --git a/components/translate/content/browser/content_translate_driver.cc b/components/translate/content/browser/content_translate_driver.cc
@@ -296,8 +296,8 @@ void ContentTranslateDriver::RegisterPage(
 
   // If we have a language histogram (i.e. we're not in incognito), update it
   // with the detected language of every page visited.
-  if (language_histogram_ && details.is_cld_reliable)
-    language_histogram_->OnPageVisited(details.cld_language);
+  if (language_histogram_ && details.is_model_reliable)
+    language_histogram_->OnPageVisited(details.model_detected_language);
 
   translate_agents_[++next_page_seq_no_].Bind(std::move(translate_agent));
   translate_agents_[next_page_seq_no_].set_disconnect_handler(

diff --git a/components/translate/content/browser/per_frame_content_translate_driver.cc b/components/translate/content/browser/per_frame_content_translate_driver.cc
@@ -354,8 +354,8 @@ void PerFrameContentTranslateDriver::OnPageLanguageDetermined(
 
   // If we have a language histogram (i.e. we're not in incognito), update it
   // with the detected language of every page visited.
-  if (language_histogram() && details.is_cld_reliable)
-    language_histogram()->OnPageVisited(details.cld_language);
+  if (language_histogram() && details.is_model_reliable)
+    language_histogram()->OnPageVisited(details.model_detected_language);
 
   if (translate_manager() && web_contents()) {
     translate_manager()->GetLanguageState()->LanguageDetermined(
@@ -406,8 +406,8 @@ void PerFrameContentTranslateDriver::OnPageContentsLanguage(
     const std::string& contents_language,
     bool is_contents_language_reliable) {
   awaiting_contents_ = false;
-  details_.cld_language = contents_language;
-  details_.is_cld_reliable = is_contents_language_reliable;
+  details_.model_detected_language = contents_language;
+  details_.is_model_reliable = is_contents_language_reliable;
 
   if (!details_.url.is_empty())
     ComputeActualPageLanguage();
@@ -418,7 +418,7 @@ void PerFrameContentTranslateDriver::ComputeActualPageLanguage() {
   // utility process.
   std::string language = DeterminePageLanguage(
       details_.content_language, details_.html_root_language,
-      details_.cld_language, details_.is_cld_reliable);
+      details_.model_detected_language, details_.is_model_reliable);
 
   if (!language.empty()) {
     details_.time = base::Time::Now();

diff --git a/components/translate/content/browser/per_frame_content_translate_driver_unittest.cc b/components/translate/content/browser/per_frame_content_translate_driver_unittest.cc
@@ -69,7 +69,7 @@ class PerFrameContentTranslateDriverTest
   }
 
   bool HasGoodContentDetection() const {
-    return observer_.GetObservedDetails().is_cld_reliable;
+    return observer_.GetObservedDetails().is_model_reliable;
   }
 
   bool DoNotTranslate() const {

diff --git a/components/translate/content/common/translate.mojom b/components/translate/content/common/translate.mojom
@@ -27,8 +27,8 @@ struct LanguageDetectionDetails {
   mojo_base.mojom.Time time;
   url.mojom.Url url;
   string content_language;
-  string cld_language;
-  bool is_cld_reliable;
+  string model_detected_language;
+  bool is_model_reliable;
   bool has_notranslate;
   string html_root_language;
   string adopted_language;

diff --git a/components/translate/content/common/translate_mojom_traits.cc b/components/translate/content/common/translate_mojom_traits.cc
@@ -102,10 +102,10 @@ bool StructTraits<translate::mojom::LanguageDetectionDetailsDataView,
     return false;
   if (!data.ReadContentLanguage(&out->content_language))
     return false;
-  if (!data.ReadCldLanguage(&out->cld_language))
+  if (!data.ReadModelDetectedLanguage(&out->model_detected_language))
     return false;
 
-  out->is_cld_reliable = data.is_cld_reliable();
+  out->is_model_reliable = data.is_model_reliable();
   out->has_notranslate = data.has_notranslate();
 
   if (!data.ReadHtmlRootLanguage(&out->html_root_language))

diff --git a/components/translate/content/common/translate_mojom_traits.h b/components/translate/content/common/translate_mojom_traits.h
@@ -39,13 +39,13 @@ struct StructTraits<translate::mojom::LanguageDetectionDetailsDataView,
     return r.content_language;
   }
 
-  static const std::string& cld_language(
+  static const std::string& model_detected_language(
       const translate::LanguageDetectionDetails& r) {
-    return r.cld_language;
+    return r.model_detected_language;
   }
 
-  static bool is_cld_reliable(const translate::LanguageDetectionDetails& r) {
-    return r.is_cld_reliable;
+  static bool is_model_reliable(const translate::LanguageDetectionDetails& r) {
+    return r.is_model_reliable;
   }
 
   static bool has_notranslate(const translate::LanguageDetectionDetails& r) {

diff --git a/components/translate/content/renderer/translate_agent.cc b/components/translate/content/renderer/translate_agent.cc
@@ -142,8 +142,8 @@ void TranslateAgent::PageCaptured(const base::string16& contents) {
   details.time = base::Time::Now();
   details.url = web_detection_details.url;
   details.content_language = content_language;
-  details.cld_language = model_detected_language;
-  details.is_cld_reliable = is_model_reliable;
+  details.model_detected_language = model_detected_language;
+  details.is_model_reliable = is_model_reliable;
   details.has_notranslate = web_detection_details.has_no_translate_meta;
   details.html_root_language = html_lang;
   details.adopted_language = language;

diff --git a/components/translate/core/common/language_detection_details.cc b/components/translate/core/common/language_detection_details.cc
@@ -6,13 +6,11 @@
 
 namespace translate {
 
-LanguageDetectionDetails::LanguageDetectionDetails()
-    : is_cld_reliable(false), has_notranslate(false) {
-}
+LanguageDetectionDetails::LanguageDetectionDetails() = default;
 
 LanguageDetectionDetails::LanguageDetectionDetails(
     const LanguageDetectionDetails& other) = default;
 
-LanguageDetectionDetails::~LanguageDetectionDetails() {}
+LanguageDetectionDetails::~LanguageDetectionDetails() = default;
 
 }  // namespace translate
diff --git a/components/translate/core/common/language_detection_details.h b/components/translate/core/common/language_detection_details.h
@@ -29,16 +29,16 @@ struct LanguageDetectionDetails {
   // The language detected by the content (Content-Language).
   std::string content_language;
 
-  // The language detected by CLD.
-  std::string cld_language;
+  // The language detected by the model.
+  std::string model_detected_language;
 
-  // Whether the CLD detection is reliable or not.
-  bool is_cld_reliable;
+  // Whether the model detection is reliable or not.
+  bool is_model_reliable = false;
 
   // Whether the notranslate is specified in head tag as a meta;
   //   <meta name="google" value="notranslate"> or
   //   <meta name="google" content="notranslate">.
-  bool has_notranslate;
+  bool has_notranslate = false;
 
   // The language written in the lang attribute of the html element.
   std::string html_root_language;