Merge 23034 - Update the plugin finder service with the latest URLs....

webkit/default_plugin/plugins2.xml

Index: webkit/default_plugin/plugins2.xml
===================================================================
--- webkit/default_plugin/plugins2.xml	(revision 23349)
+++ webkit/default_plugin/plugins2.xml	(working copy)
@@ -18,28 +18,28 @@
   	<mime_types>application/x-shockwave-flash;application/futuresplash</mime_types>
 	  <lang>en-us</lang>
   	<name>Adobe Flash Movie</name>
-  	<url>http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player.exe</url>
+    <url>http://fpdownload.adobe.com/get/flashplayer/current/install_flash_player.exe</url>
   </plugin>
 
   <plugin>
   	<mime_types>application/x-director</mime_types>
 	  <lang>en-us</lang>
   	<name>Adobe Shockwave Movie</name>
-  	<url>http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/10.2.0.023/Shockwave_Installer_Slim.exe</url>
+  	<url>http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/Shockwave_Installer_Slim.exe</url>
   </plugin>
 
   <plugin>
   	<mime_types>application/pdf;application/vnd.adobe.x-mars;application/vnd.fdf;application/vnd.adobe.xfdf;application/vnd.adobe.xdp+xml;application/vnd.adobe.xfd+xml;</mime_types>
 	  <lang>en-us</lang>
   	<name>Adobe Acrobat</name>
-  	<url>http://ardownload.adobe.com/pub/adobe/reader/win/8.x/8.1.2/enu/AdbeRdr812_en_US.exe</url>
+  	<url>http://ardownload.adobe.com/pub/adobe/reader/win/9.x/9.1/enu/AdbeRdr910_en_US.exe</url>
   </plugin>
 
   <plugin>
 	  <mime_types>video/quicktime;application/sdp;application/x-sdp;application/x-rtsp;video/flc;audio/x-wav;audio/wav;audio/aiff;audio/x-aiff;audio/basic;audio/mid;audio/x-midi;audio/midi;audio/vnd.qcelp;audio/x-gsm;audio/amr;audio/aac;audio/x-aac;audio/x-caf;audio/ac3;audio/x-ac3;video/x-mpeg;video/mpeg;audio/mpeg;audio/x-mpeg;video/3ggp;audio/3ggp;video/3ggp2;audio/3ggp2;video/sd-video;application/x-mpeg;video/mp4;audio/mp4;audio/x-m4a;audio/x-m4p;audio/x-m4b;video/x-m4v;image/x-macpaint;image/pict;image/x-pict;image/png;image/x-png;image/x-quicktime;image/x-sgi;image/x-targa;image/jp2;image/jpeg2000;image/jpeg2000-image;image/x-jpeg2000-image</mime_types>
 	  <lang>en-us</lang>
 	  <name>Quicktime player</name>
-	  <url>http://wsidecar.apple.com/cgi-bin/nph-reg3rdpty2.pl/product=19502&amp;cat=59&amp;platform=osx&amp;method=sa/QuickTimeInstaller.exe</url>
+	  <url>http://appldnld.apple.com.edgesuite.net/content.info.apple.com/QuickTime/061-6118.20090601.Pq3V9/QuickTimeInstaller.exe</url>
   </plugin>
   
 </plugins>
Property changes on: webkit\default_plugin\plugins2.xml
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/src/webkit/default_plugin/plugins2.xml:r3734-4217,4606-5108,5177-5263
   Merged /trunk/src/webkit/default_plugin/plugins2.xml:r23034