Change EmeInitDataType to be an enum class

content/browser/media/cdm/browser_cdm_manager.cc

 // 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.
 
 #include "content/browser/media/cdm/browser_cdm_manager.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
@@ skipping 328 matching lines @@
   scoped_ptr<NewSessionPromise> promise(
       new NewSessionPromise(this, render_frame_id, cdm_id, promise_id));
 
   if (init_data.size() > kMaxInitDataLength) {
     LOG(WARNING) << "InitData for ID: " << cdm_id
                  << " too long: " << init_data.size();
     promise->reject(MediaKeys::INVALID_ACCESS_ERROR, 0, "Init data too long.");
     return;
   }
 
-  media::EmeInitDataType eme_init_data_type = media::EME_INIT_DATA_TYPE_NONE;
+  media::EmeInitDataType eme_init_data_type = media::EmeInitDataType::NONE;

[sandersd (OOO until July 31), 2015/03/23 21:27:30]

I'm okay with not initializing to a value here, it's clear that every path
initializes it.

[jrummell, 2015/03/25 21:44:24]

Done. We'll see if any compiler complains.

[sandersd (OOO until July 31), 2015/03/25 22:01:28]

If you're leaving UNKNOWN in then it's fine to initialize to that.

   switch (init_data_type) {
     case INIT_DATA_TYPE_WEBM:
-      eme_init_data_type = media::EME_INIT_DATA_TYPE_WEBM;
+      eme_init_data_type = media::EmeInitDataType::WEBM;
       break;
 #if defined(USE_PROPRIETARY_CODECS)
     case INIT_DATA_TYPE_CENC:
-      eme_init_data_type = media::EME_INIT_DATA_TYPE_CENC;
+      eme_init_data_type = media::EmeInitDataType::CENC;
       break;
 #endif
     default:
       NOTREACHED();
       promise->reject(MediaKeys::INVALID_ACCESS_ERROR, 0,
                       "Invalid init data type.");
       return;
   }
 
   BrowserCdm* cdm = GetCdm(render_frame_id, cdm_id);
@@ skipping 185 matching lines @@
   if (!cdm) {
     promise->reject(MediaKeys::INVALID_STATE_ERROR, 0, "CDM not found.");
     return;
   }
 
   // TODO(ddorwin): Move this conversion to MediaDrmBridge when fixing
   // crbug.com/417440.
   // "audio"/"video" does not matter, so use "video".
   std::string init_data_type_string;
   switch (init_data_type) {
-    case media::EME_INIT_DATA_TYPE_WEBM:
+    case media::EmeInitDataType::WEBM:
       init_data_type_string = "video/webm";
       break;
 #if defined(USE_PROPRIETARY_CODECS)
-    case media::EME_INIT_DATA_TYPE_CENC:
+    case media::EmeInitDataType::CENC:
       init_data_type_string = "video/mp4";
       break;
 #endif
     default:
       NOTREACHED();
   }
 
   // Only the temporary session type is supported in browser CDM path.
   // TODO(xhwang): Add SessionType support if needed.
   cdm->CreateSessionAndGenerateRequest(media::MediaKeys::TEMPORARY_SESSION,
                                        init_data_type_string, &init_data[0],
                                        init_data.size(), promise.Pass());
 }
 
 }  // namespace content