Exclude PluginService for builds with enable_plugins==0

chrome/browser/metrics/metrics_log.cc

 // Copyright (c) 2012 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/metrics/metrics_log.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 322 matching lines @@
 
   OPEN_ELEMENT_FOR_SCOPE("profile");
   WriteCommonEventAttributes();
 
   WriteInstallElement();
 
   {
     OPEN_ELEMENT_FOR_SCOPE("stability");  // Minimal set of stability elements.
     WriteRequiredStabilityAttributes(pref);
     WriteRealtimeStabilityAttributes(pref);
-
+#if defined(ENABLE_PLUGINS)
     WritePluginStabilityElements(plugin_list, pref);
+#endif
   }
 }
 
 PrefService* MetricsLog::GetPrefService() {
   return g_browser_process->local_state();
 }
 
 gfx::Size MetricsLog::GetScreenSize() const {
   return gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().GetSizeInPixel();
 }
@@ skipping 58 matching lines @@
   SystemProfileProto::Stability* stability =
       uma_proto()->mutable_system_profile()->mutable_stability();
   stability->set_incomplete_shutdown_count(incomplete_shutdown_count);
   stability->set_breakpad_registration_success_count(
       breakpad_registration_success_count);
   stability->set_breakpad_registration_failure_count(
       breakpad_registration_failure_count);
   stability->set_debugger_present_count(debugger_present_count);
   stability->set_debugger_not_present_count(debugger_not_present_count);
 
+#if defined(ENABLE_PLUGINS)
   WritePluginStabilityElements(plugin_list, pref);
+#endif
 }
 
 void MetricsLog::WritePluginStabilityElements(
     const std::vector<webkit::WebPluginInfo>& plugin_list,
     PrefService* pref) {
   // Now log plugin stability info.
   const ListValue* plugin_stats_list = pref->GetList(
       prefs::kStabilityPluginStats);
   if (!plugin_stats_list)
     return;
@@ skipping 220 matching lines @@
          const DictionaryValue* profile_metrics) {
   DCHECK(!locked());
 
   PrefService* pref = GetPrefService();
 
   OPEN_ELEMENT_FOR_SCOPE("profile");
   WriteCommonEventAttributes();
 
   WriteInstallElement();
 
+#if defined(ENABLE_PLUGINS)
   // Write the XML version.
   // We'll write the protobuf version in RecordEnvironmentProto().
   bool write_as_xml = true;
   WritePluginList(plugin_list, write_as_xml);

[Ilya Sherman, 2012/12/19 22:45:57]

I'm not sure that it's safe to skip writing the plugin list entirely for the XML
uploads -- the UMA server might reject uploads that don't have the outer
"plugins" element.  I would prefer if you #ifdef'd out more narrowly within the
WritePluginList method.  Ditto for WritePluginStabilityElements.

[nilesh, 2012/12/19 23:18:29]

Done.

However, there is a codepath which allows for the outer "plugins" element to be
skipped (in WritePluginStabilityElements if prefs::kStabilityPluginStats
is NULL), but I am not sure if it is is ever executed or is relevant.

[Ilya Sherman, 2012/12/19 23:45:45]

Yeah, I'm not sure how paranoid to be; but since I don't know the XML server
code intimately, I'd rather be safe than sorry.  I'm looking forward to being
able to remove the XML uploading code entirely soon :)

+#endif
 
   WriteStabilityElement(plugin_list, pref);
 
   {
     // Write the XML version.
     // We'll write the protobuf version in RecordEnvironmentProto().
     OPEN_ELEMENT_FOR_SCOPE("cpu");
     WriteAttribute("arch", base::SysInfo::OperatingSystemArchitecture());
   }
 
@@ skipping 127 matching lines @@
   gpu_performance->set_overall_score(gpu_info.performance_stats.overall);
 
   const gfx::Size display_size = GetScreenSize();
   hardware->set_primary_screen_width(display_size.width());
   hardware->set_primary_screen_height(display_size.height());
   hardware->set_primary_screen_scale_factor(GetScreenDeviceScaleFactor());
   hardware->set_screen_count(GetScreenCount());
 
   WriteGoogleUpdateProto(google_update_metrics);
 
+#if defined(ENABLE_PLUGINS)
   bool write_as_xml = false;
   WritePluginList(plugin_list, write_as_xml);
+#endif
 
   std::vector<ActiveGroupId> field_trial_ids;
   GetFieldTrialIds(&field_trial_ids);
   WriteFieldTrials(field_trial_ids, system_profile);
 }
 
 void MetricsLog::RecordProfilerData(
     const tracked_objects::ProcessDataSnapshot& process_data,
     content::ProcessType process_type) {
   DCHECK(!locked());
@@ skipping 198 matching lines @@
     ProductDataToProto(google_update_metrics.google_update_data,
                        google_update->mutable_google_update_status());
   }
 
   if (!google_update_metrics.product_data.version.empty()) {
     ProductDataToProto(google_update_metrics.product_data,
                        google_update->mutable_client_status());
   }
 #endif  // defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN)
 }