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

webkit/common/blob/shareable_file_reference.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 "webkit/common/blob/shareable_file_reference.h"
 
 #include <map>
 
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/task_runner.h"
 #include "base/threading/non_thread_safe.h"
 
-namespace webkit_blob {
+namespace storage {
 
 namespace {
 
 // A shareable file map with enforcement of thread checker.
 class ShareableFileMap : public base::NonThreadSafe {
  public:
   typedef std::map<base::FilePath, ShareableFileReference*> FileMap;
   typedef FileMap::iterator iterator;
   typedef FileMap::key_type key_type;
   typedef FileMap::value_type value_type;
@@ skipping 53 matching lines @@
 }
 
 // static
 scoped_refptr<ShareableFileReference> ShareableFileReference::GetOrCreate(
     ScopedFile scoped_file) {
   if (scoped_file.path().empty())
     return scoped_refptr<ShareableFileReference>();
 
   typedef std::pair<ShareableFileMap::iterator, bool> InsertResult;
   // Required for VS2010: http://connect.microsoft.com/VisualStudio/feedback/details/520043/error-converting-from-null-to-a-pointer-type-in-std-pair
-  webkit_blob::ShareableFileReference* null_reference = NULL;
+  storage::ShareableFileReference* null_reference = NULL;
   InsertResult result = g_file_map.Get().Insert(
       ShareableFileMap::value_type(scoped_file.path(), null_reference));
   if (result.second == false) {
     scoped_file.Release();
     return scoped_refptr<ShareableFileReference>(result.first->second);
   }
 
   // Wasn't in the map, create a new reference and store the pointer.
   scoped_refptr<ShareableFileReference> reference(
       new ShareableFileReference(scoped_file.Pass()));
@@ skipping 10 matching lines @@
 ShareableFileReference::ShareableFileReference(ScopedFile scoped_file)
     : scoped_file_(scoped_file.Pass()) {
   DCHECK(g_file_map.Get().Find(path())->second == NULL);
 }
 
 ShareableFileReference::~ShareableFileReference() {
   DCHECK(g_file_map.Get().Find(path())->second == this);
   g_file_map.Get().Erase(path());
 }
 
-}  // namespace webkit_blob
+}  // namespace storage