[Offline pages] Refactor URL conversions from TabAndroid

components/offline_pages/offline_page_test_archiver.cc

Index: components/offline_pages/offline_page_test_archiver.cc
diff --git a/components/offline_pages/offline_page_test_archiver.cc b/components/offline_pages/offline_page_test_archiver.cc
index 6dfe954390299762b948ef9b3d907d3b2bd57d39..7a1ce1fcf92bcb80a358791e19a1d2399ab37cbb 100644
--- a/components/offline_pages/offline_page_test_archiver.cc
+++ b/components/offline_pages/offline_page_test_archiver.cc
@@ -11,6 +11,16 @@
 #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,
@@ -43,7 +53,11 @@ void OfflinePageTestArchiver::CreateArchive(
 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_));