Move storage-related files from webkit/ to new top-level directory storage/

chrome/browser/ui/webui/cookies_tree_model_util.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/ui/webui/cookies_tree_model_util.h"
 
 #include <vector>
 
 #include "base/i18n/time_formatting.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/browsing_data/cookies_tree_model.h"
 #include "content/public/browser/indexed_db_context.h"
 #include "content/public/browser/service_worker_context.h"
 #include "grit/generated_resources.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/ssl/ssl_client_cert_type.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/text/bytes_formatting.h"
-#include "webkit/common/fileapi/file_system_types.h"
+#include "storage/common/fileapi/file_system_types.h"
 
 #if defined(ENABLE_EXTENSIONS)
 #include "extensions/common/extension_set.h"
 #endif
 
 namespace {
 
 const char kKeyId[] = "id";
 const char kKeyTitle[] = "title";
 const char kKeyIcon[] = "icon";
@@ skipping 166 matching lines @@
           base::TimeFormatFriendlyDateAndTime(indexed_db_info.last_modified_)));
 
       break;
     }
     case CookieTreeNode::DetailedInfo::TYPE_FILE_SYSTEM: {
       dict->SetString(kKeyType, "file_system");
       dict->SetString(kKeyIcon, "chrome://theme/IDR_COOKIE_STORAGE_ICON");
 
       const BrowsingDataFileSystemHelper::FileSystemInfo& file_system_info =
           *node.GetDetailedInfo().file_system_info;
-      const fileapi::FileSystemType kPerm = fileapi::kFileSystemTypePersistent;
-      const fileapi::FileSystemType kTemp = fileapi::kFileSystemTypeTemporary;
+      const storage::FileSystemType kPerm = storage::kFileSystemTypePersistent;
+      const storage::FileSystemType kTemp = storage::kFileSystemTypeTemporary;
 
       dict->SetString(kKeyOrigin, file_system_info.origin.spec());
       dict->SetString(kKeyPersistent,
                       ContainsKey(file_system_info.usage_map, kPerm) ?
                           base::UTF16ToUTF8(ui::FormatBytes(
                               file_system_info.usage_map.find(kPerm)->second)) :
                           l10n_util::GetStringUTF8(
                               IDS_COOKIES_FILE_SYSTEM_USAGE_NONE));
       dict->SetString(kKeyTemporary,
                       ContainsKey(file_system_info.usage_map, kTemp) ?
@@ skipping 122 matching lines @@
     child = id_map_.Lookup(node_id);
     child_index = parent->GetIndexOf(child);
     if (child_index == -1)
       break;
 
     parent = child;
   }
 
   return child_index >= 0 ? child : NULL;
 }