Fix a test which uses the RenderViewTest harness running in unit_test binaries. This gives an assert in WebKit in debug builds because WebKit is only supposed to be initialized once. The fix is to separate the test from the harness.

Review URL: https://codereview.chromium.org/11066098

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161202 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 16 insertions, 16 deletions

diff --git a/content/public/test/DEPS b/content/public/test/DEPS
index 602cf35..8589b78 100644
--- a/content/public/test/DEPS
+++ b/content/public/test/DEPS
@@ -4,11 +4,12 @@ include_rules = [
 ]
 
 # Ensure we don't leak internal content headers through public headers.
-specific_include_rules = {

-  ".*\.cc": [

-    # Testing utilities can access anything in content/

-    "+content",

-    "+media/base",

-    "+third_party/iaccessible2",

-  ],

-}

+specific_include_rules = {
+  ".*\.cc": [
+    # Testing utilities can access anything in content/
+    "+content",
+    "+media/base",
+    "+third_party/iaccessible2",
+    "+ui/base/resource/resource_bundle.h",
+  ],
+}
diff --git a/content/public/test/render_view_test.cc b/content/public/test/render_view_test.cc
index 16ae1a6..4b43c90 100644
--- a/content/public/test/render_view_test.cc
+++ b/content/public/test/render_view_test.cc
@@ -21,6 +21,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "webkit/dom_storage/dom_storage_types.h"
 #include "webkit/glue/glue_serialize.h"
 #include "webkit/glue/webkit_glue.h"
@@ -149,6 +150,8 @@ void RenderViewTest::SetUp() {
   // since we are using a MockRenderThread.
   RenderThreadImpl::RegisterSchemes();
 
+  ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
+
   mock_process_.reset(new MockRenderProcess);
 
   // This needs to pass the mock render thread to the view.
diff --git a/content/public/test/render_widget_browsertest.cc b/content/public/test/render_widget_test.cc
index 1bae19a..95dd4ce 100644
--- a/content/public/test/render_widget_browsertest.cc
+++ b/content/public/test/render_widget_test.cc
@@ -2,7 +2,7 @@
 // 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_widget_browsertest.h"
+#include "content/public/test/render_widget_test.h"
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
@@ -148,8 +148,4 @@ void RenderWidgetTest::OutputBitmapToFile(const SkBitmap& bitmap,
       bitmap_data->size()));
 }
 
-TEST_F(RenderWidgetTest, OnMsgPaintAtSize) {
-  TestResizeAndPaint();
-}
-
 }  // namespace content
diff --git a/content/public/test/render_widget_browsertest.h b/content/public/test/render_widget_test.h
index b137c4f..7b471923 100644
--- a/content/public/test/render_widget_browsertest.h
+++ b/content/public/test/render_widget_test.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_PUBLIC_TEST_RENDER_WIDGET_BROWSERTEST_H_
-#define CONTENT_PUBLIC_TEST_RENDER_WIDGET_BROWSERTEST_H_
+#ifndef CONTENT_PUBLIC_TEST_RENDER_WIDGET_TEST_H_
+#define CONTENT_PUBLIC_TEST_RENDER_WIDGET_TEST_H_
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
@@ -57,4 +57,4 @@ class RenderWidgetTest : public RenderViewTest {
 
 }  // namespace content
 
-#endif  // CONTENT_PUBLIC_TEST_RENDER_WIDGET_BROWSERTEST_H_
+#endif  // CONTENT_PUBLIC_TEST_RENDER_WIDGET_TEST_H_