[Offline pages] Refactor URL conversions from TabAndroid

components/offline_pages/offline_page_test_archiver.h

 // 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.
 
 #ifndef COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_TEST_ARCHIVER_H_
 #define COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_TEST_ARCHIVER_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 31 matching lines @@
                      const CreateArchiveCallback& callback) override;
 
   // Completes the creation of archive. Should be used with |set_delayed| set to
   // ture.
   void CompleteCreateArchive();
 
   // When set to true, |CompleteCreateArchive| should be called explicitly for
   // the process to finish.
   void set_delayed(bool delayed) { delayed_ = delayed; }
 
+  // Allows to explicitly specify a file name for the tests.
+  void set_file_name(const base::FilePath& file_name) {

[dewittj, 2015/12/16 22:20:16]

I think that this be SetFileNameForTest instead.

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

Why not just passing in the constructor?

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

This is a test helper class so we don't need to add the suffix.
Because it is optional in the same way set_delayed is.
I don't want to modify the constructor, because there are other tests dependent
on this thing. We make a separate patch to change this.

+    file_name_ = file_name;
+  }
+
   bool create_archive_called() const { return create_archive_called_; }
 
  private:
   // Not owned. Outlives OfflinePageTestArchiver.
   Observer* observer_;
   GURL url_;
   base::FilePath archives_dir_;
+  base::FilePath file_name_;

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

nit: we tend to use filename

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

Done.

   ArchiverResult result_;
   int64 size_to_report_;
   bool create_archive_called_;
   bool delayed_;
   CreateArchiveCallback callback_;
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(OfflinePageTestArchiver);
 };
 
 }  // namespace offline_pages
 
 #endif  // COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_TEST_ARCHIVER_H_