Bugfixes for recent PluginGroup refactoring.

webkit/glue/plugins/webplugininfo.h

 // Copyright (c) 2006-2008 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 WEBKIT_GLUE_WEBPLUGININFO_H_
-#define WEBKIT_GLUE_WEBPLUGININFO_H_
+#ifndef WEBKIT_GLUE_PLUGINS_WEBPLUGININFO_H_
+#define WEBKIT_GLUE_PLUGINS_WEBPLUGININFO_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 
 // Describes a mime type entry for a plugin.
 struct WebPluginMimeType {
   WebPluginMimeType();
@@ skipping 11 matching lines @@
 
 // Describes an available NPAPI plugin.
 struct WebPluginInfo {
   WebPluginInfo();
   WebPluginInfo(const WebPluginInfo& rhs);
   ~WebPluginInfo();
   WebPluginInfo& operator=(const WebPluginInfo& rhs);
 
   // Special constructor only used during unit testing:
   WebPluginInfo(const string16& fake_name,
+                const FilePath& fake_path,
                 const string16& fake_version,
                 const string16& fake_desc);
 
   // The name of the plugin (i.e. Flash).
   string16 name;
 
   // The path to the plugin file (DLL/bundle/library).
   FilePath path;
 
   // The version number of the plugin file (may be OS-specific)
   string16 version;
 
   // A description of the plugin that we get from its version info.
   string16 desc;
 
   // A list of all the mime types that this plugin supports.
   std::vector<WebPluginMimeType> mime_types;
 
   // Whether the plugin is enabled.
   bool enabled;
 };
 
-#endif  // WEBKIT_GLUE_WEBPLUGININFO_H_
+#endif  // WEBKIT_GLUE_PLUGINS_WEBPLUGININFO_H_