Remove "name" field from indexed databases.

chrome/browser/browsing_data_indexed_db_helper.cc

 // Copyright (c) 2010 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/browsing_data_indexed_db_helper.h"
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
@@ skipping 90 matching lines @@
 
 void BrowsingDataIndexedDBHelperImpl::FetchIndexedDBInfoInWebKitThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT));
   file_util::FileEnumerator file_enumerator(
       profile_->GetWebKitContext()->data_path().Append(
           IndexedDBContext::kIndexedDBDirectory),
       false, file_util::FileEnumerator::FILES);
   for (FilePath file_path = file_enumerator.Next(); !file_path.empty();
        file_path = file_enumerator.Next()) {
     if (file_path.Extension() == IndexedDBContext::kIndexedDBExtension) {
-      std::string name;
-      WebSecurityOrigin web_security_origin;
-      if (!IndexedDBContext::SplitIndexedDBFileName(
-          file_path, &name, &web_security_origin)) {
-        // Could not parse file name.
-        continue;
-      }
+      WebSecurityOrigin web_security_origin =
+          WebKit::WebSecurityOrigin::createFromDatabaseIdentifier(
+              webkit_glue::FilePathToWebString(file_path.BaseName()));
       if (EqualsASCII(web_security_origin.protocol(),
                       chrome::kExtensionScheme)) {
         // Extension state is not considered browsing data.
         continue;
       }
       base::PlatformFileInfo file_info;
       bool ret = file_util::GetFileInfo(file_path, &file_info);
       if (ret) {
         indexed_db_info_.push_back(IndexedDBInfo(
             web_security_origin.protocol().utf8(),
             web_security_origin.host().utf8(),
             web_security_origin.port(),
             web_security_origin.databaseIdentifier().utf8(),
             web_security_origin.toString().utf8(),
-            name,
             file_path,
             file_info.size,
             file_info.last_modified));
       }
     }
   }
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(
@@ skipping 26 matching lines @@
   return new BrowsingDataIndexedDBHelperImpl(profile);
 }
 
 CannedBrowsingDataIndexedDBHelper::CannedBrowsingDataIndexedDBHelper(
     Profile* profile)
     : profile_(profile) {
   DCHECK(profile);
 }
 
 void CannedBrowsingDataIndexedDBHelper::AddIndexedDB(
-    const GURL& origin, const string16& name, const string16& description) {
+    const GURL& origin, const string16& description) {
   WebSecurityOrigin web_security_origin =
       WebSecurityOrigin::createFromString(
           UTF8ToUTF16(origin.spec()));
   std::string security_origin(web_security_origin.toString().utf8());
 
   for (std::vector<IndexedDBInfo>::iterator
        indexed_db = indexed_db_info_.begin();
        indexed_db != indexed_db_info_.end(); ++indexed_db) {
     if (indexed_db->origin == security_origin)
       return;
   }
 
   indexed_db_info_.push_back(IndexedDBInfo(
       web_security_origin.protocol().utf8(),
       web_security_origin.host().utf8(),
       web_security_origin.port(),
       web_security_origin.databaseIdentifier().utf8(),
       security_origin,
-      UTF16ToUTF8(name),
       profile_->GetWebKitContext()->indexed_db_context()->
-          GetIndexedDBFilePath(name, web_security_origin),
+          GetIndexedDBFilePath(web_security_origin.databaseIdentifier()),
       0,
       base::Time()));
 }
 
 void CannedBrowsingDataIndexedDBHelper::Reset() {
   indexed_db_info_.clear();
 }
 
 bool CannedBrowsingDataIndexedDBHelper::empty() const {
   return indexed_db_info_.empty();
 }
 
 void CannedBrowsingDataIndexedDBHelper::StartFetching(
     Callback1<const std::vector<IndexedDBInfo>& >::Type* callback) {
   callback->Run(indexed_db_info_);
   delete callback;
 }
 
 CannedBrowsingDataIndexedDBHelper::~CannedBrowsingDataIndexedDBHelper() {}