Merge 8764 - Add support for UA spoofing, and spoof Safari's UA string when l...

webkit/glue/plugins/plugin_host.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 "webkit/glue/plugins/plugin_host.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/string_piece.h"
@@ skipping 554 matching lines @@
   return plugin->NPP_DestroyStream(stream, reason);
 }
 
 const char* NPN_UserAgent(NPP id) {
   // Flash passes in a null id during the NP_initialize call.  We need to
   // default to the Mozilla user agent if we don't have an NPP instance or
   // else Flash won't request windowless mode.
   if (id) {
     scoped_refptr<NPAPI::PluginInstance> plugin = FindInstance(id);
     if (plugin.get() && !plugin->use_mozilla_user_agent())
-      return webkit_glue::GetUserAgent().c_str();
+      return webkit_glue::GetUserAgent(GURL()).c_str();
   }
 
   static const char *UA = "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9a1) Gecko/20061103 Firefox/2.0a1";
   return UA;
 }
 
 void NPN_Status(NPP id, const char* message) {
   // Displays a message on the status line of the browser window.
 
   // TODO: implement me
@@ skipping 268 matching lines @@
                    NPObject* obj,
                    const NPVariant *args,
                    uint32_t argCount,
                    NPVariant *result) {
   NOTREACHED();
   return false;
 }
 
 } // extern "C"