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

Unified Diff: content/test/webkit_support.cc

Issue 143953007: Changes look for scrollbars on windows (2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 years, 11 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
« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | ui/base/nine_image_painter_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/webkit_support.cc
diff --git a/content/test/webkit_support.cc b/content/test/webkit_support.cc
index bb23435350a278aa5bcb8613f729cb195f93e7d9..73bfe0045d45bc641af3e304f43f676bb481bbc5 100644
--- a/content/test/webkit_support.cc
+++ b/content/test/webkit_support.cc
@@ -5,11 +5,13 @@
#include "content/test/webkit_support.h"
#include "base/message_loop/message_loop.h"
+#include "base/path_service.h"
#include "base/run_loop.h"
#include "content/test/test_webkit_platform_support.h"
#include "third_party/WebKit/public/web/WebCache.h"
#include "third_party/WebKit/public/web/WebKit.h"
#include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
+#include "ui/base/resource/resource_bundle.h"
#include "url/url_util.h"
#include "webkit/common/user_agent/user_agent.h"
#include "webkit/common/user_agent/user_agent_util.h"
@@ -41,6 +43,19 @@ class TestEnvironment {
// TestWebKitPlatformSupport must be instantiated after MessageLoopType.
webkit_platform_support_.reset(new TestWebKitPlatformSupport);
+
+#if defined(OS_WIN)
+ base::FilePath pak_file;
+ PathService::Get(base::DIR_MODULE, &pak_file);
+ pak_file = pak_file.AppendASCII("ui_test.pak");
+ ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
+#endif
+ }
+
+ ~TestEnvironment() {
+#if defined(OS_WIN)
+ ui::ResourceBundle::CleanupSharedInstance();
+#endif
}
TestWebKitPlatformSupport* webkit_platform_support() const {
« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | ui/base/nine_image_painter_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698