Upstream version 7.35.139.0

[platform/framework/web/crosswalk.git] / src / content / child / npapi / plugin_host.cc

diff --git a/src/content/child/npapi/plugin_host.cc b/src/content/child/npapi/plugin_host.cc
index 18cea3b..6f23b05 100644 (file)
--- a/src/content/child/npapi/plugin_host.cc
+++ b/src/content/child/npapi/plugin_host.cc
@@ -6,6 +6,7 @@
 
 #include "base/command_line.h"
 #include "base/file_util.h"
+#include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_piece.h"
@@ -599,7 +600,13 @@ const char* NPN_UserAgent(NPP id) {
         "Gecko/20061103 Firefox/2.0a1";
 #endif
 
-  return content::GetContentClient()->GetUserAgent().c_str();
+  // Provide a consistent user-agent string with memory that lasts
+  // long enough for the caller to read it.
+  static base::LazyInstance<std::string>::Leaky leaky_user_agent =
+    LAZY_INSTANCE_INITIALIZER;
+  if (leaky_user_agent == NULL)
+    leaky_user_agent.Get() = content::GetContentClient()->GetUserAgent();
+  return leaky_user_agent.Get().c_str();
 }
 
 void NPN_Status(NPP id, const char* message) {