Fix media_mojo builds

media/base/cdm_promise.h

 // 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.
 
 #ifndef MEDIA_BASE_CDM_PROMISE_H_
 #define MEDIA_BASE_CDM_PROMISE_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 54 matching lines @@
                       const std::string& error_message) = 0;
 
   // Used to determine the template type of CdmPromiseTemplate<T> so that
   // saved CdmPromise objects can be cast to the correct templated version.
   virtual ResolveParameterType GetResolveParameterType() const = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CdmPromise);
 };
 
-// For some reason the Windows compiler is not happy with the implementation
-// of CdmPromiseTemplate being in the .cc file, so moving it here.
 template <typename... T>
 struct CdmPromiseTraits {};
 
 template <>
-struct CdmPromiseTraits<> {
-  static const CdmPromise::ResolveParameterType kType = CdmPromise::VOID_TYPE;
+struct MEDIA_EXPORT CdmPromiseTraits<> {
+  static const CdmPromise::ResolveParameterType kType;
 };
 
 template <>
-struct CdmPromiseTraits<int> {
-  static const CdmPromise::ResolveParameterType kType = CdmPromise::INT_TYPE;
+struct MEDIA_EXPORT CdmPromiseTraits<int> {
+  static const CdmPromise::ResolveParameterType kType;
 };
 
 template <>
-struct CdmPromiseTraits<std::string> {
-  static const CdmPromise::ResolveParameterType kType = CdmPromise::STRING_TYPE;
+struct MEDIA_EXPORT CdmPromiseTraits<std::string> {
+  static const CdmPromise::ResolveParameterType kType;
 };
 
 // This class adds the resolve(T) method. This class is still an interface, and
 // is used as the type of promise that gets passed around.
 template <typename... T>
 class MEDIA_EXPORT CdmPromiseTemplate : public CdmPromise {
  public:
   CdmPromiseTemplate() : is_settled_(false) {}
 
   virtual ~CdmPromiseTemplate() { DCHECK(is_settled_); }
@@ skipping 34 matching lines @@
  private:
   // Keep track of whether the promise has been resolved or rejected yet.
   bool is_settled_;
 
   DISALLOW_COPY_AND_ASSIGN(CdmPromiseTemplate);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_CDM_PROMISE_H_