Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(50)

Unified Diff: trunk/src/chrome/browser/translate/translate_manager_browsertest.cc

Issue 14651015: Revert 198977 "Remove unused third_party/WebKit #includes from c..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/chrome/browser/translate/translate_manager_browsertest.cc
===================================================================
--- trunk/src/chrome/browser/translate/translate_manager_browsertest.cc (revision 198991)
+++ trunk/src/chrome/browser/translate/translate_manager_browsertest.cc (working copy)
@@ -50,6 +50,7 @@
#include "net/url_request/test_url_fetcher_factory.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"
using content::BrowserThread;
@@ -222,6 +223,7 @@
protected:
virtual void SetUp() {
+ WebKit::initialize(webkit_platform_support_.Get());
// Access the TranslateManager singleton so it is created before we call
// ChromeRenderViewHostTestHarness::SetUp() to match what's done in Chrome,
// where the TranslateManager is created before the WebContents. This
@@ -251,6 +253,7 @@
content::Source<InfoBarService>(infobar_service()));
ChromeRenderViewHostTestHarness::TearDown();
+ WebKit::shutdown();
}
void SimulateTranslateScriptURLFetch(bool success) {
@@ -304,6 +307,8 @@
content::NotificationRegistrar notification_registrar_;
net::TestURLFetcherFactory url_fetcher_factory_;
content::TestBrowserThread ui_thread_;
+ content::RenderViewTest::RendererWebKitPlatformSupportImplNoSandbox
+ webkit_platform_support_;
// The infobars that have been removed.
// WARNING: the pointers point to deleted objects, use only for comparison.

Powered by Google App Engine
This is Rietveld 408576698