Remove PP_Module from parameters for PPB_Var.VarFromUtf8.

webkit/plugins/ppapi/ppapi_plugin_instance.cc

 // Copyright (c) 2011 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/plugins/ppapi/ppapi_plugin_instance.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
@@ skipping 1674 matching lines @@
   return NPObjectToPPVar(this, container_->scriptableObjectForElement());
 }
 
 PP_Var PluginInstance::ExecuteScript(PP_Instance instance,
                                      PP_Var script,
                                      PP_Var* exception) {
   // Executing the script may remove the plugin from the DOM, so we need to keep
   // a reference to ourselves so that we can still process the result after the
   // WebBindings::evaluate() below.
   scoped_refptr<PluginInstance> ref(this);
-  TryCatch try_catch(module()->pp_module(), exception);
+  TryCatch try_catch(exception);
   if (try_catch.has_exception())
     return PP_MakeUndefined();
 
   // Convert the script into an inconvenient NPString object.
   StringVar* script_string = StringVar::FromPPVar(script);
   if (!script_string) {
     try_catch.SetException("Script param to ExecuteScript must be a string.");
     return PP_MakeUndefined();
   }
   NPString np_script;
@@ skipping 18 matching lines @@
     return PP_MakeUndefined();
   }
 
   PP_Var ret = NPVariantToPPVar(this, &result);
   WebBindings::releaseVariantValue(&result);
   return ret;
 }
 
 PP_Var PluginInstance::GetDefaultCharSet(PP_Instance instance) {
   std::string encoding = delegate()->GetDefaultEncoding();
-  return StringVar::StringToPPVar(module()->pp_module(), encoding);
+  return StringVar::StringToPPVar(encoding);
 }
 
 void PluginInstance::Log(PP_Instance instance,
                          int log_level,
                          PP_Var value) {
   // TODO(brettw) get the plugin name and use it as the source.
   LogWithSource(instance, log_level, PP_MakeUndefined(), value);
 }
 
 void PluginInstance::LogWithSource(PP_Instance instance,
@@ skipping 144 matching lines @@
     PP_Instance instance,
     PP_Var relative,
     PP_URLComponents_Dev* components) {
   StringVar* relative_string = StringVar::FromPPVar(relative);
   if (!relative_string)
     return PP_MakeNull();
 
   WebElement plugin_element = container()->element();
   GURL document_url = plugin_element.document().baseURL();
   return ::ppapi::PPB_URLUtil_Shared::GenerateURLReturn(
-      module()->pp_module(),
       document_url.Resolve(relative_string->value()),
       components);
 }
 
 PP_Bool PluginInstance::DocumentCanRequest(PP_Instance instance, PP_Var url) {
   StringVar* url_string = StringVar::FromPPVar(url);
   if (!url_string)
     return PP_FALSE;
 
   WebKit::WebSecurityOrigin security_origin;
@@ skipping 16 matching lines @@
   WebKit::WebSecurityOrigin target_origin;
   if (!SecurityOriginForInstance(instance, &target_origin))
     return PP_FALSE;
 
   return BoolToPPBool(our_origin.canAccess(target_origin));
 }
 
 PP_Var PluginInstance::GetDocumentURL(PP_Instance instance,
                                       PP_URLComponents_Dev* components) {
   WebKit::WebDocument document = container()->element().document();
-  return ::ppapi::PPB_URLUtil_Shared::GenerateURLReturn(
-      module()->pp_module(), document.url(), components);
+  return ::ppapi::PPB_URLUtil_Shared::GenerateURLReturn(document.url(),
+                                                        components);
 }
 
 PP_Var PluginInstance::GetPluginInstanceURL(
     PP_Instance instance,
     PP_URLComponents_Dev* components) {
-  return ::ppapi::PPB_URLUtil_Shared::GenerateURLReturn(module()->pp_module(),
-                                                        plugin_url_,
+  return ::ppapi::PPB_URLUtil_Shared::GenerateURLReturn(plugin_url_,
                                                         components);
 }
 
 void PluginInstance::DoSetCursor(WebCursorInfo* cursor) {
   cursor_.reset(cursor);
   if (fullscreen_container_) {
     fullscreen_container_->DidChangeCursor(*cursor);
   } else {
     delegate()->DidChangeCursor(this, *cursor);
   }
@@ skipping 60 matching lines @@
   screen_size_for_fullscreen_ = gfx::Size();
   WebElement element = container_->element();
   element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_);
 }
 
 }  // namespace ppapi
 }  // namespace webkit