Get rid of some more dependencies on chrome\common from plugin, in preparatio...

chrome/plugin/webplugin_delegate_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 "chrome/plugin/webplugin_delegate_stub.h"
 
 #include "build/build_config.h"
 
 #include "base/command_line.h"
-#include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/plugin/npobject_stub.h"
 #include "chrome/plugin/plugin_channel.h"
 #include "chrome/plugin/plugin_thread.h"
 #include "chrome/plugin/webplugin_proxy.h"
+#include "content/common/content_client.h"
 #include "content/common/plugin_messages.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/npruntime.h"
 #include "skia/ext/platform_device.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 #include "webkit/glue/webcursor.h"
 
 #if defined(OS_WIN)
@@ skipping 33 matching lines @@
     instance_id_(instance_id),
     channel_(channel),
     delegate_(NULL),
     webplugin_(NULL),
     in_destructor_(false) {
   DCHECK(channel);
 }
 
 WebPluginDelegateStub::~WebPluginDelegateStub() {
   in_destructor_ = true;
-  child_process_logging::SetActiveURL(page_url_);
+  content::GetContentClient()->SetActiveURL(page_url_);
 
   if (channel_->in_send()) {
     // The delegate or an npobject is in the callstack, so don't delete it
     // right away.
     MessageLoop::current()->PostNonNestableTask(FROM_HERE,
         new FinishDestructionTask(delegate_, webplugin_));
   } else {
     // Safe to delete right away.
     if (delegate_)
       delegate_->PluginDestroyed();
 
     delete webplugin_;
   }
 }
 
 bool WebPluginDelegateStub::OnMessageReceived(const IPC::Message& msg) {
-  child_process_logging::SetActiveURL(page_url_);
+  content::GetContentClient()->SetActiveURL(page_url_);
 
   // A plugin can execute a script to delete itself in any of its NPP methods.
   // Hold an extra reference to ourself so that if this does occur and we're
   // handling a sync message, we don't crash when attempting to send a reply.
   // The exception to this is when we're already in the destructor.
   if (!in_destructor_)
     AddRef();
 
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(WebPluginDelegateStub, msg)
@@ skipping 50 matching lines @@
   return handled;
 }
 
 bool WebPluginDelegateStub::Send(IPC::Message* msg) {
   return channel_->Send(msg);
 }
 
 void WebPluginDelegateStub::OnInit(const PluginMsg_Init_Params& params,
                                    bool* result) {
   page_url_ = params.page_url;
-  child_process_logging::SetActiveURL(page_url_);
+  content::GetContentClient()->SetActiveURL(page_url_);
 
   *result = false;
   if (params.arg_names.size() != params.arg_values.size()) {
     NOTREACHED();
     return;
   }
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   FilePath path =
       command_line.GetSwitchValuePath(switches::kPluginPath);
@@ skipping 274 matching lines @@
   webplugin_->OnResourceCreated(resource_id, resource_client);
 }
 
 #if defined(OS_MACOSX)
 void WebPluginDelegateStub::OnSetFakeAcceleratedSurfaceWindowHandle(
     gfx::PluginWindowHandle window) {
   delegate_->set_windowed_handle(window);
 }
 #endif