Move all ProvisionFetcher classes out of android/ subdirectories.

media/base/provision_fetcher.h

 // Copyright 2015 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_ANDROID_PROVISION_FETCHER_H_
-#define MEDIA_BASE_ANDROID_PROVISION_FETCHER_H_
+#ifndef MEDIA_BASE_PROVISION_FETCHER_H_
+#define MEDIA_BASE_PROVISION_FETCHER_H_
 
 #include <memory>
 #include <string>
 
 #include "base/callback.h"
 #include "media/base/media_export.h"
 
 namespace media {
 
-// The interface to retrieve provision information for MediaDrmBridge.
+// The interface to retrieve provision information for CDM.
 class MEDIA_EXPORT ProvisionFetcher {
  public:
   // After provision information is retrieved this callback will be called
   // with the status flag (success/failure) and the provision response in
   // case of success.
   using ResponseCB =
       base::Callback<void(bool success, const std::string& response)>;
 
   virtual ~ProvisionFetcher() {}
 
   // Requests the provision information with |default_url| and |request_data|
-  // and calls |response_cb| callback with the response. The input parameters
-  // |default_url| and |request_data| corresponds to Java class
+  // and calls |response_cb| callback with the response. On Android, the input
+  // parameters |default_url| and |request_data| corresponds to Java class
   // MediaDrm.ProvisionRequest.
   // The implementation must call |response_cb| asynchronously on the same
   // thread that this method is called.
   virtual void Retrieve(const std::string& default_url,
                         const std::string& request_data,
                         const ResponseCB& response_cb) = 0;
 };
 
 using CreateFetcherCB = base::Callback<std::unique_ptr<ProvisionFetcher>()>;
 
 }  // namespace media
 
-#endif  // MEDIA_BASE_ANDROID_PROVISION_FETCHER_H_
+#endif  // MEDIA_BASE_PROVISION_FETCHER_H_