[Offline pages] Refactor URL conversions from TabAndroid

chrome/chrome_tests_unit.gypi

Index: chrome/chrome_tests_unit.gypi
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 683626d35fa042628e661a4a2361023db01b2806..3cf077e2a91da9100a6be3ec5e3a7469739bfb48 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1648,6 +1648,9 @@
     # Sources for Offline pages. For now only for Android.
     'chrome_unit_tests_offline_pages_sources': [
       'browser/android/offline_pages/offline_page_mhtml_archiver_unittest.cc',
+      'browser/android/offline_pages/offline_page_utils_unittest.cc',
+      'browser/android/offline_pages/test_offline_page_model_builder.cc',
+      'browser/android/offline_pages/test_offline_page_model_builder.h',
     ],
   },
   'targets': [
@@ -1679,6 +1682,7 @@
         '../components/components.gyp:invalidation_impl',
         '../components/components.gyp:invalidation_test_support',
         '../components/components.gyp:metrics_test_support',
+        '../components/components.gyp:offline_pages_test_support',
         '../components/components.gyp:omnibox_test_support',
         '../components/components.gyp:password_manager_core_browser_test_support',
         '../components/components.gyp:pref_registry_test_support',
@@ -2312,7 +2316,7 @@
           ],
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
-            '../components/components.gyp:gcm_driver',
+            '../components/components.gyp:offline_pages',
           ],
         }, {  # Not Android.
           'sources': [ '<@(chrome_unit_tests_non_android_sources)' ],