  
  // static
 diff --git a/components/metrics/metrics_service_accessor.cc b/components/metrics/metrics_service_accessor.cc
-index f00d2e8523f6f80aedd0dedcf7c8d2bc2985a0f1..565df12cd4a4c2ea7a89434709aec65331dc932b 100644
+index f00d2e8523f6f80aedd0dedcf7c8d2bc2985a0f1..4d75db134dbe537505dd87f33fdbc0204244efcb 100644
 --- a/components/metrics/metrics_service_accessor.cc
 +++ b/components/metrics/metrics_service_accessor.cc
-@@ -17,6 +17,7 @@ namespace {
- bool g_force_official_enabled_test = false;
- 
- bool IsMetricsReportingEnabledForOfficialBuild(PrefService* pref_service) {
+@@ -30,14 +30,14 @@ bool IsMetricsReportingEnabledForOfficialBuild(PrefService* pref_service) {
+ // static
+ bool MetricsServiceAccessor::IsMetricsReportingEnabled(
+     PrefService* pref_service) {
+-#if defined(GOOGLE_CHROME_BUILD)
 +#if !defined(MUON_CHROMIUM_BUILD)
-   // In official builds, disable metrics when reporting field trials are
-   // forced; otherwise, use the value of the user's preference to determine
-   // whether to enable metrics reporting.
-@@ -24,7 +25,10 @@ bool IsMetricsReportingEnabledForOfficialBuild(PrefService* pref_service) {
-              switches::kForceFieldTrials) &&
-          pref_service->GetBoolean(prefs::kMetricsReportingEnabled);
- }
--
-+#else
-+  // In non-official builds, disable metrics reporting completely.
-+  return false;
+   return IsMetricsReportingEnabledForOfficialBuild(pref_service);
+ #else
+   // In non-official builds, disable metrics reporting completely.
+   return g_force_official_enabled_test
+              ? IsMetricsReportingEnabledForOfficialBuild(pref_service)
+              : false;
+-#endif  // defined(GOOGLE_CHROME_BUILD)
 +#endif  // !defined(MUON_CHROMIUM_BUILD)
- }  // namespace
+ }
  
  // static
 diff --git a/components/os_crypt/key_storage_libsecret.cc b/components/os_crypt/key_storage_libsecret.cc

 // These are not documented, so use only after checking -respondsToSelector:.
 @interface NSApplication (UndocumentedSpeechMethods)
 - (void)speakString:(NSString*)string;
@@ -1628,6 +1634,10 @@ void RenderWidgetHostViewMac::SetActive(bool active) {
   if (render_widget_host_) {
     render_widget_host_->SetActive(active);
     if (active) {

 
 static_library("test_support") {
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 910bf38b9c46f42edc29693af2df93b6878c9fcf..597104088e0b2062a4357365623e71644f6fb1c2 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -1510,6 +1510,7 @@ ChromeContentRendererClient::CreateBrowserPluginDelegate(
 #endif
 }
 
