Introduce the ENABLE_BROWSER_CDMS macro.

content/browser/media/media_web_contents_observer.h

Index: content/browser/media/media_web_contents_observer.h
diff --git a/content/browser/media/android/media_web_contents_observer.h b/content/browser/media/media_web_contents_observer.h
similarity index 83%
rename from content/browser/media/android/media_web_contents_observer.h
rename to content/browser/media/media_web_contents_observer.h
index 38b82b27ea1c1450a7d24e9f6d98318c9aef5612..7f27ee22dbde1d63c00c444479ed93b06dca4a9d 100644
--- a/content/browser/media/android/media_web_contents_observer.h
+++ b/content/browser/media/media_web_contents_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_H_
-#define CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_H_
+#ifndef CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_
+#define CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_
 
 #include "base/compiler_specific.h"
 #include "base/containers/scoped_ptr_hash_map.h"
@@ -13,7 +13,9 @@
 namespace content {
 
 class BrowserCdmManager;
+#if defined(OS_ANDROID)
 class BrowserMediaPlayerManager;
+#endif  // defined(OS_ANDROID)
 class RenderViewHost;
 
 // This class manages all RenderFrame based media related managers at the
@@ -30,12 +32,11 @@ class CONTENT_EXPORT MediaWebContentsObserver : public WebContentsObserver {
   virtual bool OnMessageReceived(const IPC::Message& message,
                                  RenderFrameHost* render_frame_host) OVERRIDE;
 
-  // Helper functions to handle various IPC messages. Returns whether the
+#if defined(OS_ANDROID)
+  // Helper functions to handle media player IPC messages. Returns whether the
   // |message| is handled in the function.
   bool OnMediaPlayerMessageReceived(const IPC::Message& message,
                                     RenderFrameHost* render_frame_host);
-  bool OnCdmMessageReceived(const IPC::Message& message,
-                            RenderFrameHost* render_frame_host);
   bool OnMediaPlayerSetCdmMessageReceived(const IPC::Message& message,
                                           RenderFrameHost* render_frame_host);
 
@@ -44,10 +45,6 @@ class CONTENT_EXPORT MediaWebContentsObserver : public WebContentsObserver {
   BrowserMediaPlayerManager* GetMediaPlayerManager(
       RenderFrameHost* render_frame_host);
 
-  // Gets the CDM manager associated with |render_frame_host|. Creates
-  // a new one if it doesn't exist. The caller doesn't own the returned pointer.
-  BrowserCdmManager* GetCdmManager(RenderFrameHost* render_frame_host);
-
   void OnSetCdm(RenderFrameHost* render_frame_host, int player_id, int cdm_id);
 
   // Pauses all media player.
@@ -57,11 +54,24 @@ class CONTENT_EXPORT MediaWebContentsObserver : public WebContentsObserver {
   void OnFrameInfoUpdated();
 #endif  // defined(VIDEO_HOLE)
 
+#endif  // defined(OS_ANDROID)
+
+  // Helper function to handle CDM IPC messages. Returns whether the |message|
+  // is handled in the function.
+  bool OnCdmMessageReceived(const IPC::Message& message,
+                            RenderFrameHost* render_frame_host);
+
+  // Gets the CDM manager associated with |render_frame_host|. Creates
+  // a new one if it doesn't exist. The caller doesn't own the returned pointer.
+  BrowserCdmManager* GetCdmManager(RenderFrameHost* render_frame_host);

[xhwang, 2014/06/05 00:21:25]

I only moved things around to reduce number of #ifdef's. No other code editing.

[ddorwin, 2014/06/05 17:59:48]

nit: Does it make more sense to put the common code first?

[xhwang, 2014/06/09 20:57:19]

Done.

+
  private:
+#if defined(OS_ANDROID)
   // Map from RenderFrameHost* to BrowserMediaPlayerManager.
   typedef base::ScopedPtrHashMap<uintptr_t, BrowserMediaPlayerManager>
       MediaPlayerManagerMap;
   MediaPlayerManagerMap media_player_managers_;
+#endif  // defined(OS_ANDROID)
 
   // Map from RenderFrameHost* to BrowserCdmManager.
   typedef base::ScopedPtrHashMap<uintptr_t, BrowserCdmManager> CdmManagerMap;
@@ -72,4 +82,4 @@ class CONTENT_EXPORT MediaWebContentsObserver : public WebContentsObserver {
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_H_
+#endif  // CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_