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

content/child/blink_platform_unittest.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 "base/run_loop.h"
 #include "base/time/time.h"
-#include "content/child/blink_platform_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webkit/child/webkitplatformsupport_impl.h"
 
 namespace content {
 
-// Derives BlinkPlatformImpl for testing shared timers.
-class TestBlinkPlatformImpl : public BlinkPlatformImpl {
+// Derives WebKitPlatformSupportImpl for testing shared timers.
+class TestBlinkPlatformImpl : public webkit_glue::WebKitPlatformSupportImpl {
  public:
   TestBlinkPlatformImpl() : mock_monotonically_increasing_time_(0) {}
 
-  // webkit_glue::BlinkPlatformImpl:
+  // webkit_glue::WebKitPlatformSupportImpl:
   virtual base::string16 GetLocalizedString(int) OVERRIDE {
     return base::string16();
   }
 
   virtual base::StringPiece GetDataResource(int, ui::ScaleFactor) OVERRIDE {
     return base::StringPiece();
   }
 
   virtual webkit_glue::ResourceLoaderBridge* CreateResourceLoader(
       const webkit_glue::ResourceLoaderBridge::RequestInfo&) OVERRIDE {
     return NULL;
   }
 
-  virtual WebSocketStreamHandleBridge* CreateWebSocketStreamBridge(
+  virtual webkit_glue::WebSocketStreamHandleBridge* CreateWebSocketStreamBridge(
       blink::WebSocketStreamHandle*,
-      WebSocketStreamHandleDelegate*) OVERRIDE {
+      webkit_glue::WebSocketStreamHandleDelegate*) OVERRIDE {
     return NULL;
   }
 
   // Returns mock time when enabled.
   virtual double monotonicallyIncreasingTime() OVERRIDE {
     if (mock_monotonically_increasing_time_ > 0.0)
       return mock_monotonically_increasing_time_;
-    return BlinkPlatformImpl::monotonicallyIncreasingTime();
+    return webkit_glue::WebKitPlatformSupportImpl::
+        monotonicallyIncreasingTime();
   }
 
   virtual void OnStartSharedTimer(base::TimeDelta delay) OVERRIDE {
     shared_timer_delay_ = delay;
   }
 
   base::TimeDelta shared_timer_delay() { return shared_timer_delay_; }
 
   void set_mock_monotonically_increasing_time(double mock_time) {
     mock_monotonically_increasing_time_ = mock_time;
@@ skipping 26 matching lines @@
   platform_impl.set_mock_monotonically_increasing_time(new_time);
 
   // Resume timers so that the timer set above will be set again to fire
   // immediately.
   platform_impl.ResumeSharedTimer();
 
   EXPECT_TRUE(base::TimeDelta() == platform_impl.shared_timer_delay());
 }
 
 }  // namespace content