Refactoring ConstructLanguageDetectionEvent.

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 <memory>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 24 matching lines @@
 #include "components/sync/user_events/user_event_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/common/language_detection_details.h"
+#include "components/translate/core/common/language_detection_logging_helper.h"
 #include "components/variations/service/variations_service.h"
 #include "content/public/browser/navigation_entry.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(
     ShowTranslateBubbleResult result) {
   switch (result) {
     case ShowTranslateBubbleResult::BROWSER_WINDOW_NOT_VALID:
       return metrics::TranslateEventProto::BROWSER_WINDOW_IS_INVALID;
     case ShowTranslateBubbleResult::BROWSER_WINDOW_MINIMIZED:
       return metrics::TranslateEventProto::BROWSER_WINDOW_IS_MINIMIZED;
     case ShowTranslateBubbleResult::BROWSER_WINDOW_NOT_ACTIVE:
       return metrics::TranslateEventProto::BROWSER_WINDOW_NOT_ACTIVE;
     case ShowTranslateBubbleResult::WEB_CONTENTS_NOT_ACTIVE:
       return metrics::TranslateEventProto::WEB_CONTENTS_NOT_ACTIVE;
     case ShowTranslateBubbleResult::EDITABLE_FIELD_IS_ACTIVE:
       return metrics::TranslateEventProto::EDITABLE_FIELD_IS_ACTIVE;
     default:
       NOTREACHED();
       return metrics::TranslateEventProto::UNKNOWN;
   }
 }
 
-std::unique_ptr<sync_pb::UserEventSpecifics> ConstructLanguageDetectionEvent(
-    const int entry_id,
-    const translate::LanguageDetectionDetails& details) {
-  auto specifics = base::MakeUnique<sync_pb::UserEventSpecifics>();
-  specifics->set_event_time_usec(base::Time::Now().ToInternalValue());
-
-  // TODO(renjieliu): Revisit this field when the best way to identify
-  // navigations is determined.
-  specifics->set_navigation_id(base::Time::Now().ToInternalValue());
-
-  sync_pb::LanguageDetection lang_detection;
-  auto* const lang = lang_detection.add_detected_languages();
-  lang->set_language_code(details.cld_language);
-  lang->set_is_reliable(details.is_cld_reliable);
-  // Only set adopted_language when it's different from cld_language.
-  if (details.adopted_language != details.cld_language) {
-    lang_detection.set_adopted_language_code(details.adopted_language);
-  }
-  *specifics->mutable_language_detection() = lang_detection;
-  return specifics;
-}
-
 void LogLanguageDetectionEvent(
     const content::WebContents* const web_contents,
     const translate::LanguageDetectionDetails& details) {
   auto* const profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
 
   syncer::UserEventService* const user_event_service =
       browser_sync::UserEventServiceFactory::GetForProfile(profile);
 
   const auto* const entry =
       web_contents->GetController().GetLastCommittedEntry();
 
   // If entry is null, we don't record the page.
   // The navigation entry can be null in situations like download or initial
   // blank page.
   if (entry != nullptr) {
     user_event_service->RecordUserEvent(
-        ConstructLanguageDetectionEvent(entry->GetUniqueID(), details));
+        translate::ConstructLanguageDetectionEvent(details));
   }
 }
 
 }  // namespace
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(ChromeTranslateClient);
 
 ChromeTranslateClient::ChromeTranslateClient(content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       translate_driver_(&web_contents->GetController()),
@@ skipping 290 matching lines @@
       return ShowTranslateBubbleResult::SUCCESS;
   }
 
   return TranslateBubbleFactory::Show(browser->window(), web_contents(), step,
                                       error_type);
 #else
   NOTREACHED();
   return ShowTranslateBubbleResult::SUCCESS;
 #endif
 }