Move webkit/renderer/media/android/ to content/renderer/media/android/.

content/renderer/media/android/media_info_loader.cc

 // Copyright 2013 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 "webkit/renderer/media/media_info_loader.h"
+#include "content/renderer/media/android/media_info_loader.h"
 
 #include "base/bits.h"
 #include "base/callback_helpers.h"
 #include "base/metrics/histogram.h"
-#include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
 #include "third_party/WebKit/public/platform/WebURLLoader.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
+#include "third_party/WebKit/public/web/WebFrame.h"
 
 using WebKit::WebFrame;
 using WebKit::WebURLError;
 using WebKit::WebURLLoader;
 using WebKit::WebURLLoaderOptions;
 using WebKit::WebURLRequest;
 using WebKit::WebURLResponse;
+using webkit_media::ActiveLoader;
 
-namespace webkit_media {
+namespace content {
 
 static const int kHttpOK = 200;
 
 MediaInfoLoader::MediaInfoLoader(
     const GURL& url,
     WebKit::WebMediaPlayer::CORSMode cors_mode,
     const ReadyCB& ready_cb)
     : loader_failed_(false),
       url_(url),
       cors_mode_(cors_mode),
@@ skipping 142 matching lines @@
 // Helper methods.
 
 void MediaInfoLoader::DidBecomeReady(Status status) {
   UMA_HISTOGRAM_TIMES("Media.InfoLoadDelay",
                       base::TimeTicks::Now() - start_time_);
   active_loader_.reset();
   if (!ready_cb_.is_null())
     base::ResetAndReturn(&ready_cb_).Run(status);
 }
 
-}  // namespace webkit_media
+}  // namespace content