| Index: webkit/plugins/npapi/plugin_list.h
|
| diff --git a/webkit/plugins/npapi/plugin_list.h b/webkit/plugins/npapi/plugin_list.h
|
| index dcf7af722c22d89ae7baf0d9655710fb94f3258b..ebdaf3aa4621c11653f32652171606e8d5c700ee 100644
|
| --- a/webkit/plugins/npapi/plugin_list.h
|
| +++ b/webkit/plugins/npapi/plugin_list.h
|
| @@ -121,7 +121,7 @@ class WEBKIT_PLUGINS_EXPORT PluginList {
|
| static bool ParseMimeTypes(
|
| const std::string& mime_types,
|
| const std::string& file_extensions,
|
| - const string16& mime_type_descriptions,
|
| + const base::string16& mime_type_descriptions,
|
| std::vector<webkit::WebPluginMimeType>* parsed_mime_types);
|
|
|
| // Get all the plugins synchronously, loading them if necessary.
|
|
|