Revert of Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid.

media/base/browser_cdm_factory.h

Index: media/base/browser_cdm_factory.h
diff --git a/media/base/browser_cdm_factory.h b/media/base/browser_cdm_factory.h
index 2ccf1b4108a439da9d9e7aaaf78284d0b1f9fff8..b2ff0c75a467ef5863412e3f2b5027b027750c1e 100644
--- a/media/base/browser_cdm_factory.h
+++ b/media/base/browser_cdm_factory.h
@@ -21,7 +21,7 @@
 
   virtual scoped_ptr<BrowserCdm> CreateBrowserCdm(
       const std::string& key_system,
-      bool use_hw_secure_codecs,
+      bool use_secure_surface,
       const SessionMessageCB& session_message_cb,
       const SessionClosedCB& session_closed_cb,
       const LegacySessionErrorCB& legacy_session_error_cb,
@@ -38,12 +38,12 @@
 
 // Creates a BrowserCdm for |key_system|. Returns NULL if the CDM cannot be
 // created.
-// |use_hw_secure_codecs| indicates that the CDM should be configured to use
-// hardware-secure codecs (for platforms that support it).
+// |use_secure_surface| indicates that the CDM should be configured to output
+// to a secure surface (for platforms that support it).
 // TODO(xhwang): Add ifdef for IPC based CDM.
 scoped_ptr<BrowserCdm> MEDIA_EXPORT
 CreateBrowserCdm(const std::string& key_system,
-                 bool use_hw_secure_codecs,
+                 bool use_secure_surface,
                  const SessionMessageCB& session_message_cb,
                  const SessionClosedCB& session_closed_cb,
                  const LegacySessionErrorCB& legacy_session_error_cb,