media: Move CdmInitializedPromise to media/.

media/base/cdm_callback_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_CALLBACK_PROMISE_H_
 #define MEDIA_BASE_CDM_CALLBACK_PROMISE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 16 matching lines @@
                      const PromiseRejectedCB& reject_cb);
   virtual ~CdmCallbackPromise();
 
   // CdmPromiseTemplate<T> implementation.
   virtual void resolve(const T&... result) override;
   virtual void reject(MediaKeys::Exception exception_code,
                       uint32 system_code,
                       const std::string& error_message) override;
 
  private:
-  using media::CdmPromiseTemplate<T...>::MarkPromiseSettled;
+  using CdmPromiseTemplate<T...>::MarkPromiseSettled;
 
   base::Callback<void(const T&...)> resolve_cb_;
   PromiseRejectedCB reject_cb_;
 
   DISALLOW_COPY_AND_ASSIGN(CdmCallbackPromise);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_CDM_CALLBACK_PROMISE_H_