[Offline pages] Refactor URL conversions from TabAndroid

components/offline_pages/offline_page_test_archiver.cc

 // Copyright 2015 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 "components/offline_pages/offline_page_test_archiver.h"
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 namespace offline_pages {
+namespace {
+
+base::FilePath CreateArchiveFile(const base::FilePath& archives_dir,

[jianli, 2015/12/16 23:08:08]

Since this is only used in one place and the logic is simple, why not just
embedded in the calling place?

[fgorski, 2015/12/17 19:00:14]

Done.

+                                 const base::FilePath& file_name) {
+  base::FilePath file_path(archives_dir.Append(file_name));
+  base::File file(file_path, base::File::FLAG_OPEN_ALWAYS);
+  return file_path;
+}
+
+}  // namespace
 
 OfflinePageTestArchiver::OfflinePageTestArchiver(
     Observer* observer,
     const GURL& url,
     ArchiverResult result,
     int64 size_to_report,
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner)
     : observer_(observer),
       url_(url),
       result_(result),
@@ skipping 12 matching lines @@
   create_archive_called_ = true;
   callback_ = callback;
   archives_dir_ = archives_dir;
   if (!delayed_)
     CompleteCreateArchive();
 }
 
 void OfflinePageTestArchiver::CompleteCreateArchive() {
   DCHECK(!callback_.is_null());
   base::FilePath archive_path;
-  ASSERT_TRUE(base::CreateTemporaryFileInDir(archives_dir_, &archive_path));
+  if (file_name_.empty())

[jianli, 2015/12/16 23:08:08]

nit: add brackets

[fgorski, 2015/12/17 19:00:14]

Done.

+    ASSERT_TRUE(base::CreateTemporaryFileInDir(archives_dir_, &archive_path));
+  else {
+    archive_path = CreateArchiveFile(archives_dir_, file_name_);
+  }
   observer_->SetLastPathCreatedByArchiver(archive_path);
   task_runner_->PostTask(FROM_HERE, base::Bind(callback_, this, result_, url_,
                                                archive_path, size_to_report_));
 }
 
 }  // namespace offline_pages