Merge M43: Add UMA actions and histogram for the NPAPI InfoBar.

chrome/browser/plugins/plugin_metadata.h

 // 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.
 
 #ifndef CHROME_BROWSER_PLUGINS_PLUGIN_METADATA_H_
 #define CHROME_BROWSER_PLUGINS_PLUGIN_METADATA_H_
 
 #include <map>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 16 matching lines @@
 
   // Used by about:plugins to disable Reader plugin when internal PDF viewer is
   // enabled.
   static const char kAdobeReaderGroupName[];
   static const char kJavaGroupName[];
   static const char kQuickTimeGroupName[];
   static const char kShockwaveGroupName[];
   static const char kRealPlayerGroupName[];
   static const char kSilverlightGroupName[];
   static const char kWindowsMediaPlayerGroupName[];
+  static const char kGoogleTalkGroupName[];
+  static const char kGoogleEarthGroupName[];
 
   PluginMetadata(const std::string& identifier,
                  const base::string16& name,
                  bool url_for_display,
                  const GURL& plugin_url,
                  const GURL& help_url,
                  const base::string16& group_name_matcher,
                  const std::string& language);
   ~PluginMetadata();
 
@@ skipping 51 matching lines @@
   GURL help_url_;
   std::string language_;
   std::map<Version, SecurityStatus, VersionComparator> versions_;
   std::vector<std::string> all_mime_types_;
   std::vector<std::string> matching_mime_types_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginMetadata);
 };
 
 #endif  // CHROME_BROWSER_PLUGINS_PLUGIN_METADATA_H_