Implement checks for distinctiveIdentifier and persistentState in requestMediaKeySystemAccess().

content/renderer/media/render_media_client_unittest.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 <string>
 #include <vector>
 
 #include "base/test/simple_test_tick_clock.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/renderer/media/render_media_client.h"
 #include "content/test/test_content_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR.
 
 namespace content {
 
 namespace {
 
 class TestContentRendererClient : public ContentRendererClient {
  public:
   TestContentRendererClient() : is_extra_key_system_enabled_(false) {}
 
   // ContentRendererClient implementation.
   void AddKeySystems(
       std::vector<media::KeySystemInfo>* key_systems_info) override {
-    media::KeySystemInfo key_system_info("test.keysystem");
+    // TODO(sandersd): Was this supposed to be added to the list?
+    media::KeySystemInfo key_system_info;
+    key_system_info.key_system = "test.keysystem";
+    key_systems_info->push_back(key_system_info);
 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
-    if (is_extra_key_system_enabled_)
-      key_systems_info->push_back(media::KeySystemInfo(kWidevineKeySystem));
+    if (is_extra_key_system_enabled_) {
+      media::KeySystemInfo wv_key_system_info;
+      wv_key_system_info.key_system = kWidevineKeySystem;
+      key_systems_info->push_back(wv_key_system_info);

[ddorwin, 2015/02/19 01:41:33]

The lack of valid enum values doesn't cause DCHECKs somewhere?

[sandersd (OOO until July 31), 2015/02/19 21:08:34]

Done.

+    }
 #endif
   }
 
   void EnableExtraKeySystem() { is_extra_key_system_enabled_ = true; }
 
  private:
   // Whether a platform-specific extra key system is "supported" by |this|.
   bool is_extra_key_system_enabled_;
 };
 
@@ skipping 90 matching lines @@
 
   EXPECT_FALSE(render_media_client_->IsKeySystemsUpdateNeeded());
   tick_clock->Advance(base::TimeDelta::FromMilliseconds(1000));
   EXPECT_FALSE(render_media_client_->IsKeySystemsUpdateNeeded());
   tick_clock->Advance(base::TimeDelta::FromMilliseconds(1000));
   EXPECT_FALSE(render_media_client_->IsKeySystemsUpdateNeeded());
 #endif
 }
 
 }  // namespace content