Introduce the ENABLE_BROWSER_CDMS macro.

content/browser/media/media_web_contents_observer.h

 // Copyright 2014 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.
 
-#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"
 #include "content/common/content_export.h"
 #include "content/public/browser/web_contents_observer.h"
 
 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
 // browser side. It receives IPC messages from media RenderFrameObservers and
 // forwards them to the corresponding managers. The managers are responsible
 // for sending IPCs back to the RenderFrameObservers at the render side.
 class CONTENT_EXPORT MediaWebContentsObserver : public WebContentsObserver {
  public:
   explicit MediaWebContentsObserver(RenderViewHost* render_view_host);
   virtual ~MediaWebContentsObserver();
 
   // WebContentsObserver implementations.
   virtual void RenderFrameDeleted(RenderFrameHost* render_frame_host) OVERRIDE;
   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);
 
   // Gets the media player manager associated with |render_frame_host|. Creates
   // a new one if it doesn't exist. The caller doesn't own the returned pointer.
   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.
   void PauseVideo();
 
 #if defined(VIDEO_HOLE)
   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;
   CdmManagerMap cdm_managers_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserver);
 };
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_H_
+#endif  // CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_