Simplifying ContentBrowserClient::GetAdditionalMappedFiles...()

chromecast/browser/cast_content_browser_client.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 CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_
 #define CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_
 
 #include <map>
 #include <memory>
 #include <string>
@@ skipping 73 matching lines @@
 
   // Creates a MediaPipelineDevice (CMA backend) for media playback, called
   // once per media player instance.
   virtual std::unique_ptr<media::MediaPipelineBackend>
   CreateMediaPipelineBackend(const media::MediaPipelineDeviceParams& params,
                              const std::string& audio_device_id);
 
   media::MediaResourceTracker* media_resource_tracker();
 
   media::MediaPipelineBackendManager* media_pipeline_backend_manager();
+
+  ::media::ScopedAudioManagerPtr CreateAudioManager(
+      ::media::AudioLogFactory* audio_log_factory) override;
+  std::unique_ptr<::media::CdmFactory> CreateCdmFactory() override;
 #endif
   media::MediaCapsImpl* media_caps();
 
   // Invoked when the metrics client ID changes.
   virtual void SetMetricsClientId(const std::string& client_id);
 
   // Allows registration of extra metrics providers.
   virtual void RegisterMetricsProviders(
       ::metrics::MetricsService* metrics_service);
 
@@ skipping 42 matching lines @@
                        bool user_gesture,
                        bool opener_suppressed,
                        content::ResourceContext* context,
                        bool* no_javascript_access) override;
   void ExposeInterfacesToRenderer(
       service_manager::InterfaceRegistry* registry,
       content::RenderProcessHost* render_process_host) override;
   void RegisterInProcessServices(StaticServiceMap* services) override;
   std::unique_ptr<base::Value> GetServiceManifestOverlay(
       base::StringPiece service_name) override;
-#if defined(OS_ANDROID)
-  void GetAdditionalMappedFilesForChildProcess(
-      const base::CommandLine& command_line,
-      int child_process_id,
-      content::FileDescriptorInfo* mappings,
-      std::map<int, base::MemoryMappedFile::Region>* regions) override;
-#else
-  ::media::ScopedAudioManagerPtr CreateAudioManager(
-      ::media::AudioLogFactory* audio_log_factory) override;
-  std::unique_ptr<::media::CdmFactory> CreateCdmFactory() override;
   void GetAdditionalMappedFilesForChildProcess(
       const base::CommandLine& command_line,
       int child_process_id,
       content::FileDescriptorInfo* mappings) override;
-#endif  // defined(OS_ANDROID)
   void GetAdditionalWebUISchemes(
       std::vector<std::string>* additional_schemes) override;
   content::DevToolsManagerDelegate* GetDevToolsManagerDelegate() override;
 
  protected:
   CastContentBrowserClient();
 
   URLRequestContextFactory* url_request_context_factory() const {
     return url_request_context_factory_.get();
   }
@@ skipping 22 matching lines @@
   CastBrowserMainParts* cast_browser_main_parts_;
   std::unique_ptr<URLRequestContextFactory> url_request_context_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CastContentBrowserClient);
 };
 
 }  // namespace shell
 }  // namespace chromecast
 
 #endif  // CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_