Move all ProvisionFetcher classes out of android/ subdirectories.

content/browser/media/url_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 CONTENT_BROWSER_MEDIA_ANDROID_URL_PROVISION_FETCHER_H_
-#define CONTENT_BROWSER_MEDIA_ANDROID_URL_PROVISION_FETCHER_H_
+#ifndef CONTENT_BROWSER_MEDIA_URL_PROVISION_FETCHER_H_
+#define CONTENT_BROWSER_MEDIA_URL_PROVISION_FETCHER_H_
 
 #include "base/macros.h"
-#include "media/base/android/provision_fetcher.h"
+#include "media/base/provision_fetcher.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
 namespace content {
 
 // The ProvisionFetcher that retrieves the data by HTTP POST request.
 
 class URLProvisionFetcher : public media::ProvisionFetcher,
                             public net::URLFetcherDelegate {
  public:
@@ skipping 11 matching lines @@
 
   net::URLRequestContextGetter* context_getter_;
   std::unique_ptr<net::URLFetcher> request_;
   media::ProvisionFetcher::ResponseCB response_cb_;
 
   DISALLOW_COPY_AND_ASSIGN(URLProvisionFetcher);
 };
 
 }  // namespace content
 
-#endif  // CHROME_BROWSER_MEDIA_ANDROID_URL_PROVISION_FETCHER_H_
+#endif  // CONTENT_BROWSER_MEDIA_URL_PROVISION_FETCHER_H_