Register Android's media/ and net/ JNI bindings when running DumpRenderTree.

webkit/support/platform_support_android.cc

 // 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_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string16.h"
 #include "base/string_piece.h"
 #include "base/test/test_support_android.h"
 #include "googleurl/src/gurl.h"
 #include "grit/webkit_resources.h"
 #include "net/android/network_library.h"
-#include "media/base/android/media_player_listener.h"
+#include "net/android/net_jni_registrar.h"
+#include "media/base/android/media_jni_registrar.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/support/test_webkit_platform_support.h"
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.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";
@@ skipping 10 matching lines @@
   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);
 
-  if (!unit_test_mode)
-    media::MediaPlayerListener::RegisterMediaPlayerListener(env);
+  // Chromium binaries will register their Jni bindings through the library
+  // loader that is part of content/. WebKit uses a different path, so the
+  // bindings have to be initialized separately as well.
+  if (!unit_test_mode) {
+    media::RegisterJni(env);
+    net::android::RegisterJni(env);
+  }
 }
 
 void AfterInitialize(bool unit_test_mode) {
   FilePath data_path(kDumpRenderTreeDir);
   data_path = data_path.Append("DumpRenderTree.pak");
   ResourceBundle::InitSharedInstanceWithPakPath(data_path);
 
   if (unit_test_mode)
     return;
 
@@ skipping 47 matching lines @@
         if (!success)
           LOG(FATAL) << "Failed reading: " << path.value();
       }
       return resize_corner_data;
     }
   }
 
   return ResourceBundle::GetSharedInstance().GetRawDataResource(
       resource_id, scale_factor);
 }