Allow widevinecdmadapter to be built in Chromium

chrome/browser/media/encrypted_media_browsertest.cc

 // Copyright 2013 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 "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/media/media_browsertest.h"
@@ skipping 165 matching lines @@
                                    const std::string& key_system,
                                    SrcType src_type,
                                    EmeVersion eme_version) {
     std::string expected_title = kEnded;
     if (!IsPlayBackPossible(key_system))
       expected_title = kEmeKeyError;
 
     RunEncryptedMediaTest(kDefaultEmePlayer, media_file, media_type, key_system,
                           src_type, eme_version, kNoSessionToLoad, false,
                           PlayTwice::NO, expected_title);
-    // Check KeyMessage received for all key systems.
-    bool receivedKeyMessage = false;
-    EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
-        browser()->tab_strip_model()->GetActiveWebContents(),
-        "window.domAutomationController.send("
-        "document.querySelector('video').receivedKeyMessage);",
-        &receivedKeyMessage));
-    EXPECT_TRUE(receivedKeyMessage);
+    if (expected_title == kEnded) {

[ddorwin, 2015/03/28 04:00:11]

You shouldn't need this. Just make your stub return a dummy message.

[jrummell, 2015/04/01 23:37:36]

Done. With the stub changes a message event is generated.

+      // Check KeyMessage received for all key systems.
+      bool receivedKeyMessage = false;
+      EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
+          browser()->tab_strip_model()->GetActiveWebContents(),
+          "window.domAutomationController.send("
+          "document.querySelector('video').receivedKeyMessage);",
+          &receivedKeyMessage));
+      EXPECT_TRUE(receivedKeyMessage);
+    }
   }
 
   // Starts a license server if available for the |key_system| and adds a
   // 'licenseServerURL' query parameter to |query_params|.
   void StartLicenseServerIfNeeded(const std::string& key_system,
                                   base::StringPairs* query_params) {
     scoped_ptr<TestLicenseServerConfig> config = GetServerConfig(key_system);
     if (!config)
       return;
     license_server_.reset(new TestLicenseServer(config.Pass()));
@@ skipping 510 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(ECKPrefixedEncryptedMediaTest, LoadLoadableSession) {
   TestPlaybackCase(kLoadableSession, kEnded);
 }
 
 IN_PROC_BROWSER_TEST_F(ECKPrefixedEncryptedMediaTest, LoadUnknownSession) {
   // TODO(xhwang): Add a specific error for this failure, e.g. kSessionNotFound.
   TestPlaybackCase(kUnknownSession, kEmeKeyError);
 }
 #endif  // defined(ENABLE_PEPPER_CDMS)