Reduce use of DatabaseIdentifier in Indexed DB entry points.

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 <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/threading/platform_thread.h"
 #include "base/values.h"
 #include "content/browser/indexed_db/indexed_db_context_impl.h"
 #include "content/grit/content_resources.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 "storage/common/database/database_identifier.h"
 #include "third_party/zlib/google/zip.h"
 #include "ui/base/text/bytes_formatting.h"
 
 namespace content {
 
 namespace {
 
 bool AllowWhitelistedPaths(const std::vector<base::FilePath>& allowed_paths,
                            const base::FilePath& candidate_path) {
   for (const base::FilePath& allowed_path : allowed_paths) {
@@ skipping 189 matching lines @@
   size_t connection_count = context->GetConnectionCount(origin_url);
 
   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 = storage::GetIdentifierFromOrigin(origin_url);
   base::FilePath zip_path =
-      temp_path.AppendASCII(origin_id).AddExtension(FILE_PATH_LITERAL("zip"));
+      temp_path.Append(IndexedDBContextImpl::GetLevelDBFileName(origin_url))

[jsbell, 2016/03/02 17:52:56]

Using GetIdentifierFromOrigin here would be totally legitimate, since it's doing
an origin->filename creation that's not consumed elsewhere. But I decided to
switch it to use the utility just to reduce the use of DatabaseIdentifier
generally. I can switch back if desired.

[michaeln, 2016/03/02 23:51:33]

I don't have a strong opinion. Is this filename seen by the end user producing
the zip file? If so you might want to switch this usage back. If we ever switch
away from using db identifier strings for the filenames in the users data
directory, the origin identifier would probably be a more user friendly name.

[jsbell, 2016/03/03 01:11:24]

Yes, seen by the user, it becomes a file in "Downloads". And good point - I'll
switch it back.

+          .AddExtension(FILE_PATH_LITERAL("zip"));
 
   std::vector<base::FilePath> paths = context->GetStoragePaths(origin_url);
   zip::ZipWithFilterCallback(context->data_path(), zip_path,
                              base::Bind(AllowWhitelistedPaths, paths));
 
   BrowserThread::PostTask(BrowserThread::UI,
                           FROM_HERE,
                           base::Bind(&IndexedDBInternalsUI::OnDownloadDataReady,
                                      base::Unretained(this),
                                      partition_path,
@@ skipping 122 matching lines @@
 
   item->AddObserver(new FileDeleter(temp_path));
   web_ui()->CallJavascriptFunction(
       "indexeddb.onOriginDownloadReady",
       base::StringValue(partition_path.value()),
       base::StringValue(origin_url.spec()),
       base::FundamentalValue(static_cast<double>(connection_count)));
 }
 
 }  // namespace content