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

chrome/browser/translate/translate_manager_browsertest.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 <algorithm>
 #include <set>
 #include <vector>
 
 #include "base/json/json_writer.h"
@@ skipping 18 matching lines @@
 #include "chrome/common/render_messages.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents.h"
 #include "content/test/mock_render_process_host.h"
 #include "content/test/notification_observer_mock.h"
-#include "content/test/render_view_test.h"
+#include "content/test/render_test_utils.h"
 #include "content/test/test_browser_thread.h"
 #include "content/test/test_renderer_host.h"
 #include "content/test/test_renderer_host.h"
 #include "content/test/test_url_fetcher_factory.h"
 #include "grit/generated_resources.h"
 #include "ipc/ipc_test_sink.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "third_party/cld/languages/public/languages.h"
@@ skipping 198 matching lines @@
                 _,
                 Property(&content::Details<std::string>::ptr, Pointee(path))));
   }
 
   content::NotificationObserverMock pref_observer_;
 
  private:
   content::NotificationRegistrar notification_registrar_;
   TestURLFetcherFactory url_fetcher_factory_;
   content::TestBrowserThread ui_thread_;
-  content::RenderViewTest::RendererWebKitPlatformSupportImplNoSandbox
-      webkit_platform_support_;
+  content::RendererWebKitPlatformSupportImplNoSandbox webkit_platform_support_;
 
   // The infobars that have been removed.
   // WARNING: the pointers point to deleted objects, use only for comparison.
   std::set<InfoBarDelegate*> removed_infobars_;
 
   DISALLOW_COPY_AND_ASSIGN(TranslateManagerTest);
 };
 
 // An observer that keeps track of whether a navigation entry was committed.
 class NavEntryCommittedObserver : public content::NotificationObserver {
@@ skipping 1190 matching lines @@
           NULL);
   // Now simulate the URL fetch.
   SimulateTranslateScriptURLFetch(true);
   // Now the message should have been sent.
   int page_id = 0;
   std::string original_lang, target_lang;
   EXPECT_TRUE(GetTranslateMessage(&page_id, &original_lang, &target_lang));
   EXPECT_EQ("es", original_lang);
   EXPECT_EQ("en", target_lang);
 }