summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sessions
diff options
context:
space:
mode:
authorpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-06 23:41:27 +0000
committerpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-06 23:41:27 +0000
commitea29f15e3f53728ed35a02be5a200e37eb0f3f63 (patch)
treeeb3b2c3275622b797587c539771f20f8717fbadf /chrome/browser/sessions
parent8027e74b77efdfc1a64c7a8744b79eab779853c8 (diff)
downloadchromium_src-ea29f15e3f53728ed35a02be5a200e37eb0f3f63.zip
chromium_src-ea29f15e3f53728ed35a02be5a200e37eb0f3f63.tar.gz
chromium_src-ea29f15e3f53728ed35a02be5a200e37eb0f3f63.tar.bz2
Fix TabRestoreServiceTest and TranslateManagerTest when using use_webkit_compositor=1
BUG=106157 TEST=browser_tests Review URL: http://codereview.chromium.org/8790012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113288 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions')
-rw-r--r--chrome/browser/sessions/tab_restore_service_browsertest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/sessions/tab_restore_service_browsertest.cc b/chrome/browser/sessions/tab_restore_service_browsertest.cc
index c495361..bc60bb3 100644
--- a/chrome/browser/sessions/tab_restore_service_browsertest.cc
+++ b/chrome/browser/sessions/tab_restore_service_browsertest.cc
@@ -51,10 +51,10 @@ class TabRestoreServiceTest : public ChromeRenderViewHostTestHarness {
protected:
// testing::Test overrides
virtual void SetUp() {
+ WebKit::initialize(&webkit_platform_support_);
ChromeRenderViewHostTestHarness::SetUp();
time_factory_ = new TabRestoreTimeFactory();
service_.reset(new TabRestoreService(profile(), time_factory_));
- WebKit::initialize(&webkit_platform_support_);
}
virtual void TearDown() {