Use chromium logic for database identifier<->origin conversions

content/browser/indexed_db/indexed_db_internals_ui.cc

 // Copyright (c) 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 "content/browser/indexed_db/indexed_db_internals_ui.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_vector.h"
 #include "base/threading/platform_thread.h"
 #include "base/values.h"
 #include "content/browser/indexed_db/indexed_db_context_impl.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/download_url_parameters.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/common/url_constants.h"
 #include "grit/content_resources.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/zlib/google/zip.h"
 #include "webkit/base/file_path_string_conversions.h"
-#include "webkit/base/origin_url_conversions.h"
+#include "webkit/common/database/database_identifier.h"
 
 namespace content {
 
 IndexedDBInternalsUI::IndexedDBInternalsUI(WebUI* web_ui)
     : WebUIController(web_ui) {
   web_ui->RegisterMessageCallback(
       "getAllOrigins",
       base::Bind(&IndexedDBInternalsUI::GetAllOrigins, base::Unretained(this)));
 
   web_ui->RegisterMessageCallback(
@@ skipping 159 matching lines @@
 
   base::ScopedTempDir temp_dir;
   if (!temp_dir.CreateUniqueTempDir())
     return;
 
   // This will get cleaned up on the File thread after the download
   // has completed.
   base::FilePath temp_path = temp_dir.Take();
 
   std::string origin_id =
-      webkit_base::GetOriginIdentifierFromURL(origin_url);
+      webkit_database::GetIdentifierFromOrigin(origin_url);
   base::FilePath zip_path =
       temp_path.AppendASCII(origin_id).AddExtension(FILE_PATH_LITERAL("zip"));
 
   // This happens on the "webkit" thread (which is really just the IndexedDB
   // thread) as a simple way to avoid another script reopening the origin
   // while we are zipping.
   zip::Zip(context->GetFilePath(origin_url), zip_path, true);
 
   BrowserThread::PostTask(BrowserThread::UI,
                           FROM_HERE,
@@ skipping 84 matching lines @@
     return;
   }
 
   item->AddObserver(new FileDeleter(temp_path));
   web_ui()->CallJavascriptFunction("indexeddb.onOriginDownloadReady",
                                    base::StringValue(partition_path.value()),
                                    base::StringValue(origin_url.spec()));
 }
 
 }  // namespace content