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

content/test/render_view_fake_resources_test.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/public/test/render_view_fake_resources_test.h"
 
 #include <string.h>
 
 #include "base/process.h"
 #include "base/shared_memory.h"
 #include "base/time.h"
 #include "content/common/resource_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/resource_response.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl.h"
+#include "content/renderer/renderer_webkitplatformsupport_impl.h"
 #include "content/test/mock_render_process.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/upload_data.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request_status.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
@@ skipping 34 matching lines @@
   // Generate a unique channel id so that multiple instances of the test can
   // run in parallel.
   std::string channel_id = IPC::Channel::GenerateVerifiedChannelID(
       std::string());
   channel_.reset(new IPC::Channel(channel_id,
                                   IPC::Channel::MODE_SERVER, this));
   ASSERT_TRUE(channel_->Connect());
 
   webkit_glue::SetJavaScriptFlags("--expose-gc");
   mock_process_.reset(new MockRenderProcess);
+  sandbox_was_enabled_ =
+      RendererWebKitPlatformSupportImpl::SetSandboxEnabledForTesting(false);
   render_thread_ = new RenderThreadImpl(channel_id);
 
   // Tell the renderer to create a view, then wait until it's ready.
   // We can't call View::Create() directly here or else we won't get
   // RenderProcess's lazy initialization of WebKit.
   view_ = NULL;
   ViewMsg_New_Params params;
   params.parent_window = 0;
   params.view_id = kViewId;
   params.opener_route_id = MSG_ROUTING_NONE;
   params.session_storage_namespace_id =
       dom_storage::kInvalidSessionStorageNamespaceId;
   ASSERT_TRUE(channel_->Send(new ViewMsg_New(params)));
   message_loop_.Run();
 }
 
 void RenderViewFakeResourcesTest::TearDown() {
   // Try very hard to collect garbage before shutting down.
   GetMainFrame()->collectGarbage();
   GetMainFrame()->collectGarbage();
 
   ASSERT_TRUE(channel_->Send(new ViewMsg_Close(kViewId)));
   do {
     message_loop_.RunAllPending();
     view_ = NULL;
     RenderView::ForEach(this);
   } while (view_);
 
   mock_process_.reset();
+  RendererWebKitPlatformSupportImpl::SetSandboxEnabledForTesting(
+      sandbox_was_enabled_);
 }
 
 RenderView* RenderViewFakeResourcesTest::view() {
   return view_;
 }
 
 WebKit::WebFrame* RenderViewFakeResourcesTest::GetMainFrame() {
   return view_->GetWebView()->mainFrame();
 }
 
@@ skipping 89 matching lines @@
   params.url = GURL(history_item.urlString());
   params.transition = PAGE_TRANSITION_FORWARD_BACK;
   params.state = webkit_glue::HistoryItemToString(history_item);
   params.navigation_type = ViewMsg_Navigate_Type::NORMAL;
   params.request_time = base::Time::Now();
   channel_->Send(new ViewMsg_Navigate(impl->routing_id(), params));
   message_loop_.Run();
 }
 
 }  // namespace content