Revert "Revert 254514 "Revert 254507 "Reland "Move WebKitPlatformSupport...""

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"
@@ skipping 51 matching lines @@
     return file_system_root_.path();
   }
 
   virtual base::string16 GetLocalizedString(int message_id) OVERRIDE;
   virtual base::StringPiece GetDataResource(
       int resource_id,
       ui::ScaleFactor scale_factor) OVERRIDE;
   virtual webkit_glue::ResourceLoaderBridge* CreateResourceLoader(
       const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info)
      OVERRIDE;
-  virtual WebSocketStreamHandleBridge* CreateWebSocketStreamBridge(
+  virtual webkit_glue::WebSocketStreamHandleBridge* CreateWebSocketStreamBridge(
       blink::WebSocketStreamHandle* handle,
-      WebSocketStreamHandleDelegate* delegate) OVERRIDE;
+      webkit_glue::WebSocketStreamHandleDelegate* delegate) OVERRIDE;
 
   virtual blink::WebGestureCurve* createFlingAnimationCurve(
       int device_source,
       const blink::WebFloatPoint& velocity,
       const blink::WebSize& cumulative_scroll);
 
   virtual blink::WebUnitTestSupport* unitTestSupport();
 
   // WebUnitTestSupport implementation
   virtual void registerMockedURL(const blink::WebURL& url,
@@ skipping 21 matching lines @@
 
 #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_