Feedback API: Get user agent from ExtensionsClient

Add ExtensionsClient::GetUserAgent() for extension related
classes to use instead of querying the ChromeContentClient directly.

Bug: 446329
Change-Id: I3416a14d359ba50bec22d376410a0674d620b67f
Reviewed-on: https://chromium-review.googlesource.com/587403
Commit-Queue: Michael Giuffrida <michaelpg@chromium.org>
Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#491352}

chrome/browser/extensions/api/feedback_private/feedback_service.cc

@@ -10,11 +10,11 @@
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/feedback/system_logs/chrome_system_logs_fetcher.h"
-#include "chrome/common/chrome_content_client.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/blob_reader.h"
 #include "extensions/browser/extensions_browser_client.h"
+#include "extensions/common/extensions_client.h"
 #include "net/base/network_change_notifier.h"
 
 using content::BrowserThread;
@@ -33,7 +33,7 @@ void FeedbackService::SendFeedback(content::BrowserContext* browser_context,
                                    const SendFeedbackCallback& callback) {
   feedback_data->set_locale(
       ExtensionsBrowserClient::Get()->GetApplicationLocale());
-  feedback_data->set_user_agent(GetUserAgent());
+  feedback_data->set_user_agent(ExtensionsClient::Get()->GetUserAgent());
 
   if (!feedback_data->attached_file_uuid().empty()) {
     // Self-deleting object.

chrome/common/extensions/chrome_extensions_client.cc

@@ -13,6 +13,7 @@
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
+#include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/api/api_features.h"
 #include "chrome/common/extensions/api/behavior_features.h"
@@ -336,6 +337,10 @@ bool ChromeExtensionsClient::ExtensionAPIEnabledInExtensionServiceWorkers()
   return GetCurrentChannel() == version_info::Channel::UNKNOWN;
 }
 
+std::string ChromeExtensionsClient::GetUserAgent() const {
+  return ::GetUserAgent();
+}
+
 // static
 ChromeExtensionsClient* ChromeExtensionsClient::GetInstance() {
   return g_client.Pointer();

chrome/common/extensions/chrome_extensions_client.h

@@ -53,6 +53,7 @@ class ChromeExtensionsClient : public ExtensionsClient {
   std::set<base::FilePath> GetBrowserImagePaths(
       const Extension* extension) override;
   bool ExtensionAPIEnabledInExtensionServiceWorkers() const override;
+  std::string GetUserAgent() const override;
 
   // Get the LazyInstance for ChromeExtensionsClient.
   static ChromeExtensionsClient* GetInstance();

extensions/common/extensions_client.cc

@@ -32,6 +32,10 @@ bool ExtensionsClient::ExtensionAPIEnabledInExtensionServiceWorkers() const {
   return false;
 }
 
+std::string ExtensionsClient::GetUserAgent() const {
+  return std::string();
+}
+
 void ExtensionsClient::Set(ExtensionsClient* client) {
   // This can happen in unit tests, where the utility thread runs in-process.
   if (g_client)

extensions/common/extensions_client.h

@@ -128,6 +128,9 @@ class ExtensionsClient {
   // Can be overridden in tests.
   virtual bool ExtensionAPIEnabledInExtensionServiceWorkers() const;
 
+  // Returns the user agent used by the content module.
+  virtual std::string GetUserAgent() const;
+
   // Return the extensions client.
   static ExtensionsClient* Get();
 

extensions/shell/common/shell_extensions_client.cc

@@ -10,6 +10,8 @@
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "components/version_info/version_info.h"
+#include "content/public/common/user_agent.h"
 #include "extensions/common/api/generated_schemas.h"
 #include "extensions/common/common_manifest_handlers.h"
 #include "extensions/common/extension_urls.h"
@@ -190,4 +192,9 @@ bool ShellExtensionsClient::IsBlacklistUpdateURL(const GURL& url) const {
   return true;
 }
 
+std::string ShellExtensionsClient::GetUserAgent() const {
+  return content::BuildUserAgentFromProduct(
+      version_info::GetProductNameAndVersionForUserAgent());
+}
+
 }  // namespace extensions

extensions/shell/common/shell_extensions_client.h

@@ -44,6 +44,7 @@ class ShellExtensionsClient : public ExtensionsClient {
   const GURL& GetWebstoreBaseURL() const override;
   const GURL& GetWebstoreUpdateURL() const override;
   bool IsBlacklistUpdateURL(const GURL& url) const override;
+  std::string GetUserAgent() const override;
 
  private:
   const ExtensionsAPIPermissions extensions_api_permissions_;