Move all ProvisionFetcher classes out of android/ subdirectories.

content/browser/media/url_provision_fetcher.cc

 // 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.
 
-#include "content/browser/media/android/url_provision_fetcher.h"
+#include "content/browser/media/url_provision_fetcher.h"
 
 #include "base/memory/ptr_util.h"
-#include "content/public/browser/android/provision_fetcher_factory.h"
+#include "content/public/browser/provision_fetcher_factory.h"
 #include "media/base/bind_to_current_loop.h"
 #include "net/url_request/url_fetcher.h"
 
 using net::URLFetcher;
 
 namespace content {
 
 // Implementation of URLProvisionFetcher.
 
 URLProvisionFetcher::URLProvisionFetcher(
@@ skipping 35 matching lines @@
   std::string response;
   bool success = false;
   if (response_code == 200) {
     success = source->GetResponseAsString(&response);
     DVLOG_IF(1, !success) << __FUNCTION__ << ": GetResponseAsString() failed";
   } else {
     DVLOG(1) << "CDM provision: server returned error code " << response_code;
   }
 
   request_.reset();
-
   // URLFetcher implementation calls OnURLFetchComplete() on the same thread
   // that called Start() and it does this asynchronously.
   response_cb_.Run(success, response);
 }
 
 // Implementation of content public method CreateProvisionFetcher().
 
 std::unique_ptr<media::ProvisionFetcher> CreateProvisionFetcher(
     net::URLRequestContextGetter* context_getter) {
   DCHECK(context_getter);
   return base::MakeUnique<URLProvisionFetcher>(context_getter);
 }
 
 }  // namespace content