| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CONTENT_RENDERER_MEDIA_RENDER_MEDIA_CLIENT_H_ | 5 #ifndef CONTENT_RENDERER_MEDIA_RENDER_MEDIA_CLIENT_H_ |
| 6 #define CONTENT_RENDERER_MEDIA_RENDER_MEDIA_CLIENT_H_ | 6 #define CONTENT_RENDERER_MEDIA_RENDER_MEDIA_CLIENT_H_ |
| 7 | 7 |
| 8 #include "base/lazy_instance.h" | 8 #include "base/lazy_instance.h" |
| 9 #include "base/macros.h" |
| 9 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/threading/thread_checker.h" | 11 #include "base/threading/thread_checker.h" |
| 11 #include "base/time/tick_clock.h" | 12 #include "base/time/tick_clock.h" |
| 12 #include "base/time/time.h" | 13 #include "base/time/time.h" |
| 13 #include "content/common/content_export.h" | 14 #include "content/common/content_export.h" |
| 14 #include "media/base/media_client.h" | 15 #include "media/base/media_client.h" |
| 15 | 16 |
| 16 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. | 17 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. |
| 17 | 18 |
| 18 namespace content { | 19 namespace content { |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 | 59 |
| 59 #if defined(UNIT_TEST) | 60 #if defined(UNIT_TEST) |
| 60 // Helper function to access the RenderMediaClient instance. Used only by unit | 61 // Helper function to access the RenderMediaClient instance. Used only by unit |
| 61 // tests. | 62 // tests. |
| 62 CONTENT_EXPORT RenderMediaClient* GetRenderMediaClientInstanceForTesting(); | 63 CONTENT_EXPORT RenderMediaClient* GetRenderMediaClientInstanceForTesting(); |
| 63 #endif | 64 #endif |
| 64 | 65 |
| 65 } // namespace content | 66 } // namespace content |
| 66 | 67 |
| 67 #endif // CONTENT_RENDERER_MEDIA_RENDER_MEDIA_CLIENT_H_ | 68 #endif // CONTENT_RENDERER_MEDIA_RENDER_MEDIA_CLIENT_H_ |
| OLD | NEW |