Exclude PluginService for builds with enable_plugins==0

chrome/browser/metrics/metrics_log.cc

Index: chrome/browser/metrics/metrics_log.cc
diff --git a/chrome/browser/metrics/metrics_log.cc b/chrome/browser/metrics/metrics_log.cc
index 8a799979f265347c30a9dcb169610742f5507663..7e0a1ad4bf21756c17b1839ef3c319f458d6d558 100644
--- a/chrome/browser/metrics/metrics_log.cc
+++ b/chrome/browser/metrics/metrics_log.cc
@@ -340,8 +340,9 @@ void MetricsLog::RecordIncrementalStabilityElements(
     OPEN_ELEMENT_FOR_SCOPE("stability");  // Minimal set of stability elements.
     WriteRequiredStabilityAttributes(pref);
     WriteRealtimeStabilityAttributes(pref);
-
+#if defined(ENABLE_PLUGINS)
     WritePluginStabilityElements(plugin_list, pref);
+#endif
   }
 }
 
@@ -420,7 +421,9 @@ void MetricsLog::WriteStabilityElement(
   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(
@@ -661,10 +664,12 @@ void MetricsLog::RecordEnvironment(
 
   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);
 
@@ -812,8 +817,10 @@ void MetricsLog::RecordEnvironmentProto(
 
   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);