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

Unified Diff: webkit/support/platform_support_android.cc

Issue 18429012: Don't load resources for test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 7 years, 4 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 | « no previous file | webkit/support/platform_support_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/support/platform_support_android.cc
diff --git a/webkit/support/platform_support_android.cc b/webkit/support/platform_support_android.cc
index bae32f1439392547b9728785115482681b264401..582dc3a85bd74e546f1de8a53ebffe883581c1d7 100644
--- a/webkit/support/platform_support_android.cc
+++ b/webkit/support/platform_support_android.cc
@@ -50,13 +50,9 @@ void BeforeInitialize() {
}
void AfterInitialize() {
- base::FilePath data_path(kDumpRenderTreeDir);
- data_path = data_path.Append("DumpRenderTree.pak");
- ResourceBundle::InitSharedInstanceWithPakPath(data_path);
}
void BeforeShutdown() {
- ResourceBundle::CleanupSharedInstance();
}
void AfterShutdown() {
@@ -64,38 +60,3 @@ void AfterShutdown() {
} // namespace webkit_support
-base::string16 TestWebKitPlatformSupport::GetLocalizedString(int message_id) {
- return ResourceBundle::GetSharedInstance().GetLocalizedString(message_id);
-}
-
-base::StringPiece TestWebKitPlatformSupport::GetDataResource(
- int resource_id,
- ui::ScaleFactor scale_factor) {
- base::FilePath resources_path(kDumpRenderTreeDir);
- resources_path = resources_path.Append("DumpRenderTree_resources");
- switch (resource_id) {
- case IDR_BROKENIMAGE: {
- CR_DEFINE_STATIC_LOCAL(std::string, broken_image_data, ());
- if (broken_image_data.empty()) {
- base::FilePath path = resources_path.Append("missingImage.gif");
- bool success = file_util::ReadFileToString(path, &broken_image_data);
- if (!success)
- LOG(FATAL) << "Failed reading: " << path.value();
- }
- return broken_image_data;
- }
- case IDR_TEXTAREA_RESIZER: {
- CR_DEFINE_STATIC_LOCAL(std::string, resize_corner_data, ());
- if (resize_corner_data.empty()) {
- base::FilePath path = resources_path.Append("textAreaResizeCorner.png");
- bool success = file_util::ReadFileToString(path, &resize_corner_data);
- if (!success)
- LOG(FATAL) << "Failed reading: " << path.value();
- }
- return resize_corner_data;
- }
- }
-
- return ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
- resource_id, scale_factor);
-}
« no previous file with comments | « no previous file | webkit/support/platform_support_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698