Revert 96409 - Speculatively revert r96364, it's the best bet on the NaCL breakage.

chrome/browser/metrics/metrics_log.cc

 // Copyright (c) 2011 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 273 matching lines @@
     // testing unreleased new extensions.
     WriteAttribute("name", CreateBase64Hash(UTF16ToUTF8(iter->name)));
     std::string filename_bytes =
 #if defined(OS_WIN)
         UTF16ToUTF8(iter->path.BaseName().value());
 #else
         iter->path.BaseName().value();
 #endif
     WriteAttribute("filename", CreateBase64Hash(filename_bytes));
     WriteAttribute("version", UTF16ToUTF8(iter->version));
+    // TODO(bauerb): Plug-in state is per-profile.
     WriteIntAttribute("disabled", !webkit::npapi::IsPluginEnabled(*iter));
   }
 }
 
 void MetricsLog::WriteInstallElement() {
   OPEN_ELEMENT_FOR_SCOPE("install");
   WriteAttribute("installdate", GetInstallDate());
   WriteIntAttribute("buildid", 0);  // We're using appversion instead.
 }
 
@@ skipping 182 matching lines @@
       const std::string result_type(AutocompleteMatch::TypeToString(i->type));
       if (!result_type.empty())
         WriteAttribute("resulttype", result_type);
       WriteIntAttribute("relevance", i->relevance);
       WriteIntAttribute("isstarred", i->starred ? 1 : 0);
     }
   }
 
   ++num_events_;
 }