Skip to content

Commit a0a3546

Browse files
committed
Bug 1919768 - Remove global constructor from dom/media/fake-cdm/cdm-test-decryptor.cpp r=emilio
Differential Revision: https://phabricator.services.mozilla.com/D222793 UltraBlame original commit: 7a2922c3db4a350e2c0d1bf41046de6838c016fb
1 parent 431fa15 commit a0a3546

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

dom/media/fake-cdm/cdm-test-decryptor.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ std::vector<std::string> Tokenize(const std::string& aString) {
8686
return std::vector<std::string>(it, end);
8787
}
8888

89-
static const std::string TruncateRecordId = "truncate-record-id";
90-
static const std::string TruncateRecordData = "I will soon be truncated";
89+
static const char TruncateRecordId[] = "truncate-record-id";
90+
static const char TruncateRecordData[] = "I will soon be truncated";
9191

9292
template <class Continuation>
9393
class WriteRecordSuccessTask {
@@ -225,7 +225,7 @@ class VerifyAndOverwriteContinuation : public ReadContinuation {
225225
const std::string mTestID;
226226
};
227227

228-
static const std::string OpenAgainRecordId = "open-again-record-id";
228+
static const char OpenAgainRecordId[] = "open-again-record-id";
229229

230230
class OpenedSecondTimeContinuation : public OpenContinuation {
231231
public:
@@ -390,7 +390,6 @@ class ReportReadRecordContinuation : public ReadContinuation {
390390
enum ShutdownMode { ShutdownNormal, ShutdownTimeout, ShutdownStoreToken };
391391

392392
static ShutdownMode sShutdownMode = ShutdownNormal;
393-
static std::string sShutdownToken;
394393

395394
void FakeDecryptor::UpdateSession(uint32_t aPromiseId, const char* aSessionId,
396395
uint32_t aSessionIdLength,
@@ -421,8 +420,7 @@ void FakeDecryptor::UpdateSession(uint32_t aPromiseId, const char* aSessionId,
421420
sShutdownMode = ShutdownTimeout;
422421
} else if (mode == "token") {
423422
sShutdownMode = ShutdownStoreToken;
424-
sShutdownToken = tokens[2];
425-
Message("shutdown-token received " + sShutdownToken);
423+
Message("shutdown-token received " + tokens[2]);
426424
}
427425
} else if (task == "retrieve-shutdown-token") {
428426
ReadRecord(FakeDecryptor::sInstance->mHost, "shutdown-token",

0 commit comments

Comments
 (0)