Added audio/mpeg and video/mpeg to the list of mime types supported by the Ac...

webkit/glue/plugins/plugin_list.cc

 // 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.
 
 #include "config.h"
 
 #include "webkit/glue/plugins/plugin_list.h"
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 138 matching lines @@
 
 void PluginList::LoadPlugins(bool refresh) {
   if (plugins_loaded_ && !refresh)
     return;
 
   plugins_.clear();
   plugins_loaded_ = true;
 
   base::TimeTicks start_time = base::TimeTicks::Now();
 
-  LoadInternalPlugins();
-
   std::vector<FilePath> directories_to_scan;
   GetPluginDirectories(&directories_to_scan);
 
   for (size_t i = 0; i < directories_to_scan.size(); ++i) {
     LoadPluginsFromDir(directories_to_scan[i]);
   }
 
   for (size_t i = 0; i < extra_plugin_dirs_.size(); ++i) {
     LoadPluginsFromDir(extra_plugin_dirs_[i]);
   }
 
   for (size_t i = 0; i < extra_plugin_paths_.size(); ++i)
     LoadPlugin(extra_plugin_paths_[i]);
 
   if (webkit_glue::IsDefaultPluginEnabled())
     LoadPlugin(FilePath(kDefaultPluginLibraryName));
 
+  LoadInternalPlugins();
+
   base::TimeTicks end_time = base::TimeTicks::Now();
   base::TimeDelta elapsed = end_time - start_time;
   DLOG(INFO) << "Loaded plugin list in " << elapsed.InMilliseconds() << " ms.";
 }
 
 void PluginList::LoadPlugin(const FilePath &path) {
   WebPluginInfo plugin_info;
   const PluginEntryPoints* entry_points;
 
   if (!ReadPluginInfo(path, &plugin_info, &entry_points))
@@ skipping 144 matching lines @@
   }
 
   return false;
 }
 
 void PluginList::Shutdown() {
   // TODO
 }
 
 } // namespace NPAPI