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

chrome/plugin/webplugin_proxy.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_proxy.h"
 
 #include "build/build_config.h"
 
 #include "base/lazy_instance.h"
 #include "base/scoped_handle.h"
 #include "base/shared_memory.h"
 #include "build/build_config.h"
-#include "chrome/common/child_process_logging.h"
-#include "chrome/common/url_constants.h"
 #include "chrome/plugin/npobject_proxy.h"
 #include "chrome/plugin/npobject_util.h"
 #include "chrome/plugin/plugin_channel.h"
 #include "chrome/plugin/plugin_thread.h"
+#include "content/common/content_client.h"
 #include "content/common/plugin_messages.h"
 #include "skia/ext/platform_device.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "ui/gfx/blit.h"
 #include "ui/gfx/canvas.h"
 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
@@ skipping 254 matching lines @@
                                       int notify_id,
                                       bool popups_allowed,
                                       bool notify_redirects) {
  if (!target && (0 == base::strcasecmp(method, "GET"))) {
     // Please refer to https://bugzilla.mozilla.org/show_bug.cgi?id=366082
     // for more details on this.
     if (delegate_->GetQuirks() &
         webkit::npapi::WebPluginDelegateImpl::
             PLUGIN_QUIRK_BLOCK_NONSTANDARD_GETURL_REQUESTS) {
       GURL request_url(url);
-      if (!request_url.SchemeIs(chrome::kHttpScheme) &&
-          !request_url.SchemeIs(chrome::kHttpsScheme) &&
-          !request_url.SchemeIs(chrome::kFtpScheme)) {
+      if (!request_url.SchemeIs("http") &&
+          !request_url.SchemeIs("https") &&
+          !request_url.SchemeIs("ftp")) {

[Avi (use Gerrit), 2011/03/15 19:50:28]

:(

Can we please move the constants too?

[jam, 2011/03/15 20:30:06]

I searched the code to see what modules below chrome use, and all (i.e. even
net) hardcoded them.

         return;
       }
     }
   }
 
   PluginHostMsg_URLRequest_Params params;
   params.url = url;
   params.method = method;
   if (target)
     params.target = std::string(target);
@@ skipping 315 matching lines @@
                                      TransportDIB::Handle* dib_handle) {
   Send(new PluginHostMsg_AllocTransportDIB(route_id_, size, dib_handle));
 }
 
 void WebPluginProxy::FreeSurfaceDIB(TransportDIB::Id dib_id) {
   Send(new PluginHostMsg_FreeTransportDIB(route_id_, dib_id));
 }
 #endif
 
 void WebPluginProxy::OnPaint(const gfx::Rect& damaged_rect) {
-  child_process_logging::SetActiveURL(page_url_);
+  content::GetContentClient()->SetActiveURL(page_url_);
 
   Paint(damaged_rect);
   Send(new PluginHostMsg_InvalidateRect(route_id_, damaged_rect));
 }
 
 bool WebPluginProxy::IsOffTheRecord() {
   return channel_->incognito();
 }
 
 void WebPluginProxy::ResourceClientDeleted(
     WebPluginResourceClient* resource_client) {
   ResourceClientMap::iterator index = resource_clients_.begin();
   while (index != resource_clients_.end()) {
     WebPluginResourceClient* client = (*index).second;
 
     if (client == resource_client) {
       resource_clients_.erase(index++);
     } else {
       index++;
     }
   }
 }
 
 void WebPluginProxy::URLRedirectResponse(bool allow, int resource_id) {
   Send(new PluginHostMsg_URLRedirectResponse(route_id_, allow, resource_id));
 }