Move clipboard_utils.* from webkit/renderer to content/renderer.

compositor_bindings/ will be moved separately since it is its own beast.

cpp_* will also be moved later.

BUG=265753
TEST=None, just moving files around. :/
R=jamesr@chromium.org,avi@chromium.org,jochen@chromium.org

Review URL: https://codereview.chromium.org/25378002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226477 0039d316-1c4b-4281-b951-d872f2087c98

content/content_renderer.gypi

@@ -79,6 +79,8 @@
     'renderer/android/phone_number_detector.h',
     'renderer/android/synchronous_compositor_factory.cc',
     'renderer/android/synchronous_compositor_factory.h',
+    'renderer/clipboard_utils.cc',
+    'renderer/clipboard_utils.h',
     'renderer/cursor_utils.cc',
     'renderer/cursor_utils.h',
     'renderer/device_orientation/device_motion_event_pump.cc',

webkit/renderer/clipboard_utils.cc → content/renderer/clipboard_utils.cc

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/renderer/clipboard_utils.h"
+#include "content/renderer/clipboard_utils.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "net/base/escape.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 
-namespace webkit_clipboard {
+namespace content {
 
 std::string URLToMarkup(const WebKit::WebURL& url,
                         const WebKit::WebString& title) {
@@ -36,4 +36,4 @@ std::string URLToImageMarkup(const WebKit::WebURL& url,
   return markup;
 }
 
-}  // namespace webkit_clipboard
+}  // namespace content

webkit/renderer/clipboard_utils.h → content/renderer/clipboard_utils.h

@@ -2,27 +2,26 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_RENDERER_CLIPBOARD_UTILS_H_
-#define WEBKIT_RENDERER_CLIPBOARD_UTILS_H_
+#ifndef CONTENT_RENDERER_CLIPBOARD_UTILS_H_
+#define CONTENT_RENDERER_CLIPBOARD_UTILS_H_
 
 #include <string>
 
-#include "webkit/renderer/webkit_renderer_export.h"
+#include "content/common/content_export.h"
 
 namespace WebKit {
 class WebString;
 class WebURL;
 }
 
-namespace webkit_clipboard {
+namespace content {
 
-WEBKIT_RENDERER_EXPORT std::string URLToMarkup(const WebKit::WebURL& url,
-                                               const WebKit::WebString& title);
+CONTENT_EXPORT std::string URLToMarkup(const WebKit::WebURL& url,
+                                       const WebKit::WebString& title);
 
-WEBKIT_RENDERER_EXPORT std::string URLToImageMarkup(
-    const WebKit::WebURL& url,
-    const WebKit::WebString& title);
+CONTENT_EXPORT std::string URLToImageMarkup(const WebKit::WebURL& url,
+                                            const WebKit::WebString& title);
 
-}  // namespace webkit_clipboard
+}  // namespace content
 
-#endif  //  WEBKIT_RENDERER_CLIPBOARD_UTILS_H_
+#endif  //  CONTENT_RENDERER_CLIPBOARD_UTILS_H_

content/renderer/webclipboard_impl.cc

@@ -9,6 +9,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/common/drop_data.h"
+#include "content/renderer/clipboard_utils.h"
 #include "content/renderer/drop_data_builder.h"
 #include "content/renderer/scoped_clipboard_writer_glue.h"
 #include "third_party/WebKit/public/platform/WebData.h"
@@ -23,7 +24,6 @@
 #include "ui/base/clipboard/custom_data_helper.h"
 #include "url/gurl.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/renderer/clipboard_utils.h"
 
 using WebKit::WebClipboard;
 using WebKit::WebData;
@@ -175,13 +175,13 @@ void WebClipboardImpl::writeURL(const WebURL& url, const WebString& title) {
   ScopedClipboardWriterGlue scw(client_);
 
   scw.WriteBookmark(title, url.spec());
-  scw.WriteHTML(UTF8ToUTF16(webkit_clipboard::URLToMarkup(url, title)),
-                std::string());
+  scw.WriteHTML(UTF8ToUTF16(URLToMarkup(url, title)), std::string());
   scw.WriteText(UTF8ToUTF16(std::string(url.spec())));
 }
 
-void WebClipboardImpl::writeImage(
-    const WebImage& image, const WebURL& url, const WebString& title) {
+void WebClipboardImpl::writeImage(const WebImage& image,
+                                  const WebURL& url,
+                                  const WebString& title) {
   ScopedClipboardWriterGlue scw(client_);
 
   if (!image.isNull()) {
@@ -200,8 +200,7 @@ void WebClipboardImpl::writeImage(
     // We also don't want to write HTML on a Mac, since Mail.app prefers to use
     // the image markup over attaching the actual image. See
     // http://crbug.com/33016 for details.
-    scw.WriteHTML(UTF8ToUTF16(webkit_clipboard::URLToImageMarkup(url, title)),
-                  std::string());
+    scw.WriteHTML(UTF8ToUTF16(URLToImageMarkup(url, title)), std::string());
 #endif
   }
 }
@@ -252,4 +251,3 @@ bool WebClipboardImpl::ConvertBufferType(Buffer buffer,
 }
 
 }  // namespace content
-

content/test/mock_webclipboard_impl.cc

@@ -10,6 +10,7 @@
 #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"
@@ -18,7 +19,6 @@
 #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;
@@ -149,22 +149,22 @@ void MockWebClipboardImpl::writePlainText(const WebKit::WebString& plain_text) {
   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;
   }
 }

webkit/renderer/webkit_renderer.gyp

@@ -28,8 +28,6 @@
         'cpp_bound_class.h',
         'cpp_variant.cc',
         'cpp_variant.h',
-        'clipboard_utils.cc',
-        'clipboard_utils.h',
         'webkit_renderer_export.h',
       ],
     },