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

content/test/render_view_test.h

 // 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.
 
 #ifndef CONTENT_TEST_RENDER_VIEW_TEST_H_
 #define CONTENT_TEST_RENDER_VIEW_TEST_H_
 #pragma once
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/common/main_function_params.h"
 #include "content/renderer/mock_content_renderer_client.h"
-#include "content/renderer/renderer_webkitplatformsupport_impl.h"
 #include "content/test/mock_keyboard.h"
 #include "content/test/mock_render_thread.h"
+#include "content/test/render_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 
 class MockRenderProcess;
 class RendererMainPlatformDelegate;
 
 namespace WebKit {
 class WebHistoryItem;
 class WebWidget;
 }
 
 namespace content {
 class RenderView;
 }
 
 namespace gfx {
 class Rect;
 }
 
 namespace content {
 
 class RenderViewTest : public testing::Test {
  public:
-  // A special WebKitPlatformSupportImpl class for getting rid off the
-  // dependency to the sandbox, which is not available in RenderViewTest.
-  class RendererWebKitPlatformSupportImplNoSandbox :
-      public RendererWebKitPlatformSupportImpl {
-   public:
-    virtual WebKit::WebSandboxSupport* sandboxSupport() {
-      return NULL;
-    }
-  };
-
   RenderViewTest();
   virtual ~RenderViewTest();
 
  protected:
   // Spins the message loop to process all messages that are currently pending.
   void ProcessPendingMessages();
 
   // Returns a pointer to the main frame.
   WebKit::WebFrame* GetMainFrame();
 
@@ skipping 79 matching lines @@
   scoped_ptr<content::MainFunctionParams> params_;
   scoped_ptr<CommandLine> command_line_;
 
  private:
   void GoToOffset(int offset, const WebKit::WebHistoryItem& history_item);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_TEST_RENDER_VIEW_TEST_H_