Adds a stub method & classes for those which aren't used in android.

Also excludes usage of WebMediaPlayerImpl from render_view_impl.cc as it will be
implemented differently for android in a future CL. These changes are required to
make progress in getting content_unittests link for android.

BUG=113218
TEST=


Review URL: http://codereview.chromium.org/9361039

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

5 files changed, 41 insertions, 2 deletions

diff --git a/content/common/font_list_android.cc b/content/common/font_list_android.cc
new file mode 100644
index 0000000..c860b1a
--- /dev/null
+++ b/content/common/font_list_android.cc
@@ -0,0 +1,15 @@
+// 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 "content/common/font_list.h"
+
+#include "base/values.h"
+
+namespace content {
+
+ListValue* GetFontList_SlowBlocking() {
+  return new ListValue;
+}
+
+}  // namespace content
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 318649c..49db28a 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -135,6 +135,7 @@
     'common/font_config_ipc_linux.cc',
     'common/font_config_ipc_linux.h',
     'common/font_list.h',
+    'common/font_list_android.cc',
     'common/font_list_mac.mm',
     'common/font_list_win.cc',
     'common/font_list_x11.cc',
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 9214d7a..e8c24e7 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -2124,11 +2124,16 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer(
       content::GetContentClient()->renderer()->OverrideCreateWebMediaPlayer(
           this, frame, client, AsWeakPtr(), collection, audio_source_provider,
           message_loop_factory, media_stream_impl_.get(), render_media_log);
+#if defined(OS_ANDROID)
+  // TODO(qinmin): Implement for android.
+  // http://crbug.com/113218
+#else
   if (!media_player) {
     media_player = new webkit_media::WebMediaPlayerImpl(
         frame, client, AsWeakPtr(), collection, audio_source_provider,
         message_loop_factory, media_stream_impl_.get(), render_media_log);
   }
+#endif
   return media_player;
 }
 
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index 0b2f35b..576f148 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -962,7 +962,7 @@ class RenderViewImpl : public RenderWidget,
   // selection handles in sync with the webpage.
   void SyncSelectionIfRequired();
 
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
   void UpdateFontRenderingFromRendererPrefs();
 #else
   void UpdateFontRenderingFromRendererPrefs() {}
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc
index ce8e3d7..063e5cf 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc
@@ -63,7 +63,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/mac/WebSandboxSupport.h"
 #endif
 
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
 #include <string>
 #include <map>
 
@@ -116,6 +116,12 @@ class RendererWebKitPlatformSupportImpl::FileUtilities
                                       int mode);
 };
 
+#if defined(OS_ANDROID)
+// WebKit doesn't use WebSandboxSupport on android so we don't need to
+// implement anything here.
+class RendererWebKitPlatformSupportImpl::SandboxSupport {
+};
+#else
 class RendererWebKitPlatformSupportImpl::SandboxSupport
     : public WebKit::WebSandboxSupport {
  public:
@@ -146,6 +152,7 @@ class RendererWebKitPlatformSupportImpl::SandboxSupport
   std::map<string16, WebKit::WebFontFamily> unicode_font_families_;
 #endif
 };
+#endif  // defined(OS_ANDROID)
 
 //------------------------------------------------------------------------------
 
@@ -181,7 +188,12 @@ RendererWebKitPlatformSupportImpl::fileUtilities() {
 }
 
 WebKit::WebSandboxSupport* RendererWebKitPlatformSupportImpl::sandboxSupport() {
+#if defined(OS_ANDROID)
+  // WebKit doesn't use WebSandboxSupport on android.
+  return NULL;
+#else
   return sandbox_support_.get();
+#endif
 }
 
 WebKit::WebCookieJar* RendererWebKitPlatformSupportImpl::cookieJar() {
@@ -490,6 +502,12 @@ bool RendererWebKitPlatformSupportImpl::SandboxSupport::loadFont(
   return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out);
 }
 
+#elif defined(OS_ANDROID)
+
+// WebKit doesn't use WebSandboxSupport on android so we don't need to
+// implement anything here. This is cleaner to support than excluding the
+// whole class for android.
+
 #elif defined(OS_POSIX)
 
 void