Refactor SyncedWindowDelegateAndroid into TabModel

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index cbc76c2c273cba764b18d06d1ddd745980ff5692..12738b1d4fa4801cd01d470aa8755359cc1e9a7d 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2240,6 +2240,7 @@
         'browser/sync/glue/synced_session.h',
         'browser/sync/glue/synced_session.cc',
         'browser/sync/glue/synced_window_delegate.h',
+        'browser/sync/glue/synced_window_delegate_android.h',
         'browser/sync/glue/synced_window_delegate_android.cc',
         'browser/sync/glue/sync_backend_host.cc',
         'browser/sync/glue/sync_backend_host.h',
@@ -2367,6 +2368,7 @@
         'browser/translate/translate_tab_helper.h',
         'browser/ui/alternate_error_tab_observer.cc',
         'browser/ui/alternate_error_tab_observer.h',
+        'browser/ui/android/browser_otr_state_android.cc',
         'browser/ui/android/certificate_viewer_android.cc',
         'browser/ui/android/color_chooser_android.cc',
         'browser/ui/android/extensions/extension_install_dialog_android.cc',
@@ -2378,6 +2380,10 @@
         'browser/ui/android/simple_message_box_android.cc',
         'browser/ui/android/ssl_client_certificate_selector.cc',
         'browser/ui/android/tab_contents/chrome_web_contents_view_delegate_android.cc',
+        'browser/ui/android/tab_model/tab_model.cc',
+        'browser/ui/android/tab_model/tab_model.h',
+        'browser/ui/android/tab_model/tab_model_list.cc',
+        'browser/ui/android/tab_model/tab_model_list.h',
         'browser/ui/android/tab_restore_service_delegate_android.cc',
         'browser/ui/app_modal_dialogs/app_modal_dialog.cc',
         'browser/ui/app_modal_dialogs/app_modal_dialog.h',
@@ -2449,6 +2455,8 @@
         'browser/ui/browser_mac.h',
         'browser/ui/browser_navigator.cc',
         'browser/ui/browser_navigator.h',
+        'browser/ui/browser_otr_state.cc',
+        'browser/ui/browser_otr_state.h',
         'browser/ui/browser_ui_prefs.cc',
         'browser/ui/browser_ui_prefs.h',
         'browser/ui/browser_tab_restore_service_delegate.cc',
@@ -4859,10 +4867,6 @@
           'dependencies': [
             'chrome_browser_jni_headers',
           ],
-          'sources': [
-            'browser/sync/glue/synced_window_delegate_registry.cc',
-            'browser/sync/glue/synced_window_delegate_registry.h',
-          ],
           'sources!': [
             'browser/bookmarks/bookmark_context_menu_controller.cc',
             # Bookmark export/import are handled via the BookmarkColumns
@@ -4903,6 +4907,7 @@
             'browser/ui/browser_finder.cc',
             'browser/ui/browser_list.cc',
             'browser/ui/browser_navigator.cc',
+            'browser/ui/browser_otr_state.cc',
             'browser/ui/browser_tab_restore_service_delegate.cc',
             'browser/ui/browser_tabstrip.cc',
             'browser/ui/browser_tabstrip.h',