Fix TabRestoreServiceTest and TranslateManagerTest when using use_webkit_compositor=1

chrome/browser/translate/translate_manager_browsertest.cc

Index: chrome/browser/translate/translate_manager_browsertest.cc
diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc
index 29a2582a2fad31bde80a622d6a8b96c975bf3f13..3e521510212ef159fc967d32906e8c962caf4dc0 100644
--- a/chrome/browser/translate/translate_manager_browsertest.cc
+++ b/chrome/browser/translate/translate_manager_browsertest.cc
@@ -31,12 +31,14 @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/test/notification_observer_mock.h"
+#include "content/test/render_view_test.h"
 #include "content/test/test_browser_thread.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"

[oshima, 2011/12/06 18:40:51]

move new includes into "if defined(USE_WEBKIT_COMPOSITOR)

[piman, 2011/12/06 19:30:49]

Done.

 #include "third_party/cld/languages/public/languages.h"
 
 using content::BrowserThread;
@@ -153,6 +155,9 @@ class TranslateManagerTest : public TabContentsWrapperTestHarness,
 
  protected:
   virtual void SetUp() {
+#if defined(USE_WEBKIT_COMPOSITOR)
+    WebKit::initialize(&webkit_platform_support_);
+#endif
     // Access the TranslateManager singleton so it is created before we call
     // TabContentsWrapperTestHarness::SetUp() to match what's done in Chrome,
     // where the TranslateManager is created before the TabContents.  This
@@ -182,6 +187,9 @@ class TranslateManagerTest : public TabContentsWrapperTestHarness,
             contents_wrapper()->infobar_tab_helper()));
 
     TabContentsWrapperTestHarness::TearDown();
+#if defined(USE_WEBKIT_COMPOSITOR)
+    WebKit::shutdown();
+#endif
   }
 
   void SimulateTranslateScriptURLFetch(bool success) {
@@ -239,6 +247,10 @@ class TranslateManagerTest : public TabContentsWrapperTestHarness,
   content::NotificationRegistrar notification_registrar_;
   TestURLFetcherFactory url_fetcher_factory_;
   content::TestBrowserThread ui_thread_;
+#if defined(USE_WEBKIT_COMPOSITOR)
+  content::RenderViewTest::RendererWebKitPlatformSupportImplNoSandbox
+      webkit_platform_support_;
+#endif
 
   // The infobars that have been removed.
   // WARNING: the pointers point to deleted objects, use only for comparison.