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

Unified Diff: webkit/support/platform_support_android.cc

Issue 17029016: Remove DRT-specific resource loading logic (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | « webkit/support/platform_support.h ('k') | 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
deleted file mode 100644
index ebe272a946039ba4c6175f171ae5b7c94f606239..0000000000000000000000000000000000000000
--- a/webkit/support/platform_support_android.cc
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "webkit/support/platform_support.h"
-
-#include "base/android/jni_android.h"
-#include "base/file_util.h"
-#include "base/files/file_path.h"
-#include "base/logging.h"
-#include "base/path_service.h"
-#include "base/strings/string16.h"
-#include "base/strings/string_piece.h"
-#include "base/test/test_support_android.h"
-#include "googleurl/src/gurl.h"
-#include "grit/webkit_resources.h"
-#include "media/base/android/media_jni_registrar.h"
-#include "net/android/net_jni_registrar.h"
-#include "net/android/network_library.h"
-#include "ui/android/ui_jni_registrar.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/gl/android/gl_jni_registrar.h"
-#include "webkit/support/simple_resource_loader_bridge.h"
-#include "webkit/support/test_webkit_platform_support.h"
-
-namespace {
-
-// The place where the Android layout test script will put the required tools
-// and resources. Must keep consistent with DEVICE_DRT_DIR in
-// WebKit/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py.
-const char kDumpRenderTreeDir[] = "/data/local/tmp/drt";
-
-}
-
-namespace webkit_support {
-
-void BeforeInitialize() {
- base::InitAndroidTestPaths();
-
- // Place cache under kDumpRenderTreeDir to allow the NRWT script to clear it.
- base::FilePath path(kDumpRenderTreeDir);
- path = path.Append("cache");
- PathService::Override(base::DIR_CACHE, path);
-
- // Set XML_CATALOG_FILES environment variable to blank to prevent libxml from
- // loading and complaining the non-exsistent /etc/xml/catalog file.
- setenv("XML_CATALOG_FILES", "", 0);
-
- JNIEnv* env = base::android::AttachCurrentThread();
- net::android::RegisterNetworkLibrary(env);
-}
-
-void AfterInitialize() {
- base::FilePath data_path(kDumpRenderTreeDir);
- data_path = data_path.Append("DumpRenderTree.pak");
- ResourceBundle::InitSharedInstanceWithPakPath(data_path);
-}
-
-void BeforeShutdown() {
- ResourceBundle::CleanupSharedInstance();
-}
-
-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 | « webkit/support/platform_support.h ('k') | webkit/support/platform_support_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698