Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto…

chrome/browser/media_galleries/fileapi/supported_audio_video_checker.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 "chrome/browser/media_galleries/fileapi/supported_audio_video_checker.h"
 
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 45 matching lines @@
 }  // namespace
 
 SupportedAudioVideoChecker::~SupportedAudioVideoChecker() {}
 
 // static
 bool SupportedAudioVideoChecker::SupportsFileType(const base::FilePath& path) {
   return g_audio_video_extensions.Get().HasSupportedAudioVideoExtension(path);
 }
 
 void SupportedAudioVideoChecker::StartPreWriteValidation(
-    const fileapi::CopyOrMoveFileValidator::ResultCallback& result_callback) {
+    const storage::CopyOrMoveFileValidator::ResultCallback& result_callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   DCHECK(callback_.is_null());
   callback_ = result_callback;
 
   content::BrowserThread::PostTaskAndReplyWithResult(
       content::BrowserThread::FILE,
       FROM_HERE,
       base::Bind(&OpenOnFileThread, path_),
       base::Bind(&SupportedAudioVideoChecker::OnFileOpen,
                  weak_factory_.GetWeakPtr()));
 }
 
 SupportedAudioVideoChecker::SupportedAudioVideoChecker(
     const base::FilePath& path)
     : path_(path),
       weak_factory_(this) {
 }
 
 void SupportedAudioVideoChecker::OnFileOpen(base::File file) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   if (!file.IsValid()) {
     callback_.Run(base::File::FILE_ERROR_SECURITY);
     return;
   }
 
   safe_checker_ = new SafeAudioVideoChecker(file.Pass(), callback_);
   safe_checker_->Start();
 }