Add GetPluginPath() to npobject_util to avoid content/plugin/ include from npobject_stub.cc

content/common/npobject_stub.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 "content/common/npobject_stub.h"
 
+#include "base/command_line.h"
 #include "content/common/content_client.h"
+#include "content/common/content_switches.h"
+#include "content/common/np_channel_base.h"
 #include "content/common/npobject_util.h"
 #include "content/common/plugin_messages.h"
-#include "content/plugin/plugin_thread.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/npruntime.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "webkit/plugins/npapi/plugin_constants_win.h"
 
-class NPChannelBase;
-
 using WebKit::WebBindings;
 
 NPObjectStub::NPObjectStub(
     NPObject* npobject,
     NPChannelBase* channel,
     int route_id,
     gfx::NativeViewId containing_window,
     const GURL& page_url)
     : npobject_(npobject),
       channel_(channel),
@@ skipping 207 matching lines @@
   if (!CreateNPVariant(
           property, channel_, &property_var, containing_window_, page_url_)) {
     NPObjectMsg_SetProperty::WriteReplyParams(reply_msg, result);
     channel_->Send(reply_msg);
     return;
   }
 
   if (IsPluginProcess()) {
     if (npobject_->_class->setProperty) {
 #if defined(OS_WIN)
+      static FilePath plugin_path =
+          CommandLine::ForCurrentProcess()->GetSwitchValuePath(
+              switches::kPluginPath);
       static std::wstring filename = StringToLowerASCII(
-          PluginThread::current()->plugin_path().BaseName().value());
+          plugin_path.BaseName().value());
       static NPIdentifier fullscreen =
           WebBindings::getStringIdentifier("fullScreen");
       if (filename == webkit::npapi::kNewWMPPlugin && id == fullscreen) {
         // Workaround for bug 15985, which is if Flash causes WMP to go
         // full screen a deadlock can occur when WMP calls SetFocus.
         NPObjectMsg_SetProperty::WriteReplyParams(reply_msg, true);
         Send(reply_msg);
         reply_msg = NULL;
       }
 #endif
@@ skipping 128 matching lines @@
 
   bool return_value = WebBindings::evaluateHelper(0, popups_allowed, npobject_,
                                                   &script_string, &result_var);
 
   NPVariant_Param result_param;
   CreateNPVariantParam(
       result_var, channel_, &result_param, true, containing_window_, page_url_);
   NPObjectMsg_Evaluate::WriteReplyParams(reply_msg, result_param, return_value);
   channel_->Send(reply_msg);
 }