Fix client-side phishing detection test flakiness and ChromeOS failure.

content/renderer/render_thread_impl.cc

 // Copyright (c) 2012 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 "content/renderer/render_thread_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <vector>
@@ skipping 454 matching lines @@
 }
 
 void RenderThreadImpl::EnsureWebKitInitialized() {
   if (webkit_platform_support_.get())
     return;
 
   v8::V8::SetCounterFunction(base::StatsTable::FindLocation);
   v8::V8::SetCreateHistogramFunction(CreateHistogram);
   v8::V8::SetAddHistogramSampleFunction(AddHistogramSample);
 
-  webkit_platform_support_.reset(new RendererWebKitPlatformSupportImpl);
+  webkit_platform_support_.reset(CreateWebKitPlatformSupport());
   WebKit::initialize(webkit_platform_support_.get());
 
   bool has_enable = CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableThreadedCompositing);
   bool has_disable = CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableThreadedCompositing);
   bool enable = has_enable && (!has_disable);
   if (enable) {
     compositor_thread_.reset(new CompositorThread(this));
     AddFilter(compositor_thread_->GetMessageFilter());
@@ skipping 331 matching lines @@
 void RenderThreadImpl::DoNotNotifyWebKitOfModalLoop() {
   notify_webkit_of_modal_loop_ = false;
 }
 
 void RenderThreadImpl::OnSetZoomLevelForCurrentURL(const std::string& host,
                                                    double zoom_level) {
   RenderViewZoomer zoomer(host, zoom_level);
   content::RenderView::ForEach(&zoomer);
 }
 
+RendererWebKitPlatformSupportImpl*
+RenderThreadImpl::CreateWebKitPlatformSupport() {
+  return new RendererWebKitPlatformSupportImpl;
+}
+
 bool RenderThreadImpl::OnControlMessageReceived(const IPC::Message& msg) {
   ObserverListBase<RenderProcessObserver>::Iterator it(observers_);
   RenderProcessObserver* observer;
   while ((observer = it.GetNext()) != NULL) {
     if (observer->OnControlMessageReceived(msg))
       return true;
   }
 
   // Some messages are handled by delegates.
   if (appcache_dispatcher_->OnMessageReceived(msg) ||
@@ skipping 149 matching lines @@
 
 scoped_refptr<base::MessageLoopProxy>
 RenderThreadImpl::GetFileThreadMessageLoopProxy() {
   DCHECK(message_loop() == MessageLoop::current());
   if (!file_thread_.get()) {
     file_thread_.reset(new base::Thread("Renderer::FILE"));
     file_thread_->Start();
   }
   return file_thread_->message_loop_proxy();
 }