Use real PlatformSupport in content unit tests

content/public/test/unittest_test_suite.cc

Index: content/public/test/unittest_test_suite.cc
diff --git a/content/public/test/unittest_test_suite.cc b/content/public/test/unittest_test_suite.cc
index 934eb44b860c28c020ede27b3efbd746b045bec3..eb615e02a0afad835c00aa77436e399ffd257504 100644
--- a/content/public/test/unittest_test_suite.cc
+++ b/content/public/test/unittest_test_suite.cc
@@ -7,44 +7,22 @@
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "base/test/test_suite.h"
-#include "third_party/WebKit/public/platform/Platform.h"
+#if !defined(OS_IOS)
+#include "content/test/test_webkit_platform_support.h"
+#endif
 #include "third_party/WebKit/public/web/WebKit.h"
 
 namespace content {
 
-#if !defined(OS_IOS)
-// A stubbed out WebKit platform support impl.
-class UnitTestTestSuite::UnitTestWebKitPlatformSupport
-    : public blink::Platform {
- public:
-  UnitTestWebKitPlatformSupport() {}
-  virtual ~UnitTestWebKitPlatformSupport() {}
-  virtual void cryptographicallyRandomValues(unsigned char* buffer,
-                                             size_t length) OVERRIDE {
-    base::RandBytes(buffer, length);
-  }
-  virtual const unsigned char* getTraceCategoryEnabledFlag(
-      const char* categoryName) {
-    // Causes tracing macros to be disabled.
-    static const unsigned char kEnabled = 0;
-    return &kEnabled;
-  }
-};
-#endif  // !OS_IOS
-
 UnitTestTestSuite::UnitTestTestSuite(base::TestSuite* test_suite)
     : test_suite_(test_suite) {
   DCHECK(test_suite);
 #if !defined(OS_IOS)
-  webkit_platform_support_.reset(new UnitTestWebKitPlatformSupport);
-  blink::initialize(webkit_platform_support_.get());
+  platform_support_.reset(new TestWebKitPlatformSupport);
 #endif
 }
 
 UnitTestTestSuite::~UnitTestTestSuite() {
-#if !defined(OS_IOS)
-  blink::shutdown();
-#endif
 }
 
 int UnitTestTestSuite::Run() {