Move the rest of source files from webkit/renderer to content/renderer.

content/test/mock_webclipboard_impl.cc

 // Copyright 2013 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/test/mock_webclipboard_impl.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "content/renderer/clipboard_utils.h"
 #include "third_party/WebKit/public/platform/WebCommon.h"
 #include "third_party/WebKit/public/platform/WebDragData.h"
 #include "third_party/WebKit/public/platform/WebImage.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/size.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/renderer/clipboard_utils.h"
 
 using WebKit::WebDragData;
 using WebKit::WebString;
 using WebKit::WebURL;
 using WebKit::WebVector;
 
 MockWebClipboardImpl::MockWebClipboardImpl() {
 }
 
 MockWebClipboardImpl::~MockWebClipboardImpl() {
@@ skipping 110 matching lines @@
   m_plainText = plainText;
   m_writeSmartPaste = writeSmartPaste;
 }
 
 void MockWebClipboardImpl::writePlainText(const WebKit::WebString& plain_text) {
   clear();
 
   m_plainText = plain_text;
 }
 
-void MockWebClipboardImpl::writeURL(
-    const WebKit::WebURL& url, const WebKit::WebString& title) {
+void MockWebClipboardImpl::writeURL(const WebKit::WebURL& url,
+                                    const WebKit::WebString& title) {
   clear();
 
-  m_htmlText = WebString::fromUTF8(webkit_clipboard::URLToMarkup(url, title));
+  m_htmlText = WebString::fromUTF8(content::URLToMarkup(url, title));
   m_plainText = url.spec().utf16();
 }
 
 void MockWebClipboardImpl::writeImage(const WebKit::WebImage& image,
-    const WebKit::WebURL& url, const WebKit::WebString& title) {
+                                      const WebKit::WebURL& url,
+                                      const WebKit::WebString& title) {
   if (!image.isNull()) {
     clear();
 
     m_plainText = m_htmlText;
-    m_htmlText = WebString::fromUTF8(
-        webkit_clipboard::URLToImageMarkup(url, title));
+    m_htmlText = WebString::fromUTF8(content::URLToImageMarkup(url, title));
     m_image = image;
   }
 }
 
 void MockWebClipboardImpl::writeDataObject(const WebDragData& data) {
   clear();
 
   const WebVector<WebDragData::Item>& itemList = data.items();
   for (size_t i = 0; i < itemList.size(); ++i) {
     const WebDragData::Item& item = itemList[i];
@@ skipping 16 matching lines @@
     }
   }
 }
 
 void MockWebClipboardImpl::clear() {
   m_plainText = WebString();
   m_htmlText = WebString();
   m_image.reset();
   m_customData.clear();
   m_writeSmartPaste = false;
 }

[jam, 2013/10/02 21:11:00]

this file should be in the content namespace, and then get rid of "content::"
everywhere