Move the rest of webkit/glue into content/common

content/test/test_webkit_platform_support.h

 // 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.
 
 #ifndef CONTENT_TEST_TEST_WEBKIT_PLATFORM_SUPPORT_H_
 #define CONTENT_TEST_TEST_WEBKIT_PLATFORM_SUPPORT_H_
 
 #include "base/compiler_specific.h"
 #include "base/files/scoped_temp_dir.h"
+#include "content/child/simple_webmimeregistry_impl.h"
+#include "content/child/webfileutilities_impl.h"
 #include "content/child/webkitplatformsupport_child_impl.h"
 #include "content/test/mock_webclipboard_impl.h"
 #include "content/test/weburl_loader_mock_factory.h"
 #include "third_party/WebKit/public/platform/WebUnitTestSupport.h"
-#include "webkit/glue/simple_webmimeregistry_impl.h"
-#include "webkit/glue/webfileutilities_impl.h"
 #include "webkit/renderer/compositor_bindings/web_compositor_support_impl.h"
 
 namespace blink {
 class WebLayerTreeView;
 }
 
 namespace content {
 
 // An implementation of WebKitPlatformSupport for tests.
 class TestWebKitPlatformSupport
@@ skipping 64 matching lines @@
   virtual void unregisterMockedURL(const blink::WebURL& url);
   virtual void unregisterAllMockedURLs();
   virtual void serveAsynchronousMockedRequests();
   virtual blink::WebString webKitRootDir();
   virtual blink::WebLayerTreeView* createLayerTreeViewForTesting();
   virtual blink::WebLayerTreeView* createLayerTreeViewForTesting(
       TestViewType type);
   virtual blink::WebData readFromFile(const blink::WebString& path);
 
  private:
-  webkit_glue::SimpleWebMimeRegistryImpl mime_registry_;
+  SimpleWebMimeRegistryImpl mime_registry_;
   scoped_ptr<MockWebClipboardImpl> mock_clipboard_;
-  webkit_glue::WebFileUtilitiesImpl file_utilities_;
+  WebFileUtilitiesImpl file_utilities_;
   base::ScopedTempDir file_system_root_;
   scoped_ptr<WebURLLoaderMockFactory> url_loader_factory_;
   webkit::WebCompositorSupportImpl compositor_support_;
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
   blink::WebThemeEngine* active_theme_engine_;
 #endif
   DISALLOW_COPY_AND_ASSIGN(TestWebKitPlatformSupport);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_TEST_TEST_WEBKIT_PLATFORM_SUPPORT_H_