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

chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc

 // Copyright (c) 2012 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/mtp_device_map_service.h"
 
 #include <string>
 #include <utility>
 
 #include "base/stl_util.h"
@@ skipping 67 matching lines @@
   AsyncDelegateMap::iterator it = async_delegate_map_.find(device_location);
   DCHECK(it != async_delegate_map_.end());
   it->second->CancelPendingTasksAndDeleteDelegate();
   async_delegate_map_.erase(it);
 }
 
 MTPDeviceAsyncDelegate* MTPDeviceMapService::GetMTPDeviceAsyncDelegate(
     const std::string& filesystem_id) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   base::FilePath device_path;
-  if (!fileapi::ExternalMountPoints::GetSystemInstance()->GetRegisteredPath(
+  if (!storage::ExternalMountPoints::GetSystemInstance()->GetRegisteredPath(
           filesystem_id, &device_path)) {
     return NULL;
   }
 
   const base::FilePath::StringType& device_location = device_path.value();
   DCHECK(!device_location.empty());
   AsyncDelegateMap::const_iterator it =
       async_delegate_map_.find(device_location);
   return (it != async_delegate_map_.end()) ? it->second : NULL;
 }
 
 MTPDeviceMapService::MTPDeviceMapService() {
 }
 
 MTPDeviceMapService::~MTPDeviceMapService() {
   DCHECK(mtp_device_usage_map_.empty());
 }