New authorization framework for sync. ...

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
===================================================================
--- chrome/chrome_browser.gypi	(revision 58702)
+++ chrome/chrome_browser.gypi	(working copy)
@@ -2538,18 +2538,18 @@
         'browser/sync/engine/syncapi.h',
         'browser/sync/glue/app_data_type_controller.cc',
         'browser/sync/glue/app_data_type_controller.h',
+        'browser/sync/glue/autofill_change_processor.cc',
         'browser/sync/glue/autofill_change_processor.h',
-        'browser/sync/glue/autofill_change_processor.cc',
         'browser/sync/glue/autofill_data_type_controller.cc',
         'browser/sync/glue/autofill_data_type_controller.h',
+        'browser/sync/glue/autofill_model_associator.cc',
         'browser/sync/glue/autofill_model_associator.h',
-        'browser/sync/glue/autofill_model_associator.cc',
         'browser/sync/glue/bookmark_change_processor.cc',
         'browser/sync/glue/bookmark_change_processor.h',
         'browser/sync/glue/bookmark_data_type_controller.cc',
         'browser/sync/glue/bookmark_data_type_controller.h',
+        'browser/sync/glue/bookmark_model_associator.cc',
         'browser/sync/glue/bookmark_model_associator.h',
-        'browser/sync/glue/bookmark_model_associator.cc',
         'browser/sync/glue/change_processor.cc',
         'browser/sync/glue/change_processor.h',
         'browser/sync/glue/data_type_controller.h',
@@ -2566,16 +2566,14 @@
         'browser/sync/glue/extension_data_type_controller.h',
         'browser/sync/glue/extension_model_associator.cc',
         'browser/sync/glue/extension_model_associator.h',
+        'browser/sync/glue/extension_sync.cc',
+        'browser/sync/glue/extension_sync.h',
         'browser/sync/glue/extension_sync_traits.cc',
         'browser/sync/glue/extension_sync_traits.h',
-        'browser/sync/glue/extension_sync.cc',
-        'browser/sync/glue/extension_sync.h',
         'browser/sync/glue/extension_util.cc',
         'browser/sync/glue/extension_util.h',
         'browser/sync/glue/history_model_worker.cc',
         'browser/sync/glue/history_model_worker.h',
-        'browser/sync/glue/password_model_worker.cc',
-        'browser/sync/glue/password_model_worker.h',
         'browser/sync/glue/http_bridge.cc',
         'browser/sync/glue/http_bridge.h',
         'browser/sync/glue/model_associator.h',
@@ -2585,6 +2583,8 @@
         'browser/sync/glue/password_data_type_controller.h',
         'browser/sync/glue/password_model_associator.cc',
         'browser/sync/glue/password_model_associator.h',
+        'browser/sync/glue/password_model_worker.cc',
+        'browser/sync/glue/password_model_worker.h',
         'browser/sync/glue/preference_change_processor.cc',
         'browser/sync/glue/preference_change_processor.h',
         'browser/sync/glue/preference_data_type_controller.cc',
@@ -2616,13 +2616,15 @@
         'browser/sync/glue/typed_url_model_associator.h',
         'browser/sync/glue/ui_model_worker.cc',
         'browser/sync/glue/ui_model_worker.h',
+        'browser/sync/notification_method.cc',
         'browser/sync/notification_method.h',
-        'browser/sync/notification_method.cc',
-        'browser/sync/profile_sync_service.cc',
-        'browser/sync/profile_sync_service.h',
         'browser/sync/profile_sync_factory.h',
         'browser/sync/profile_sync_factory_impl.cc',
         'browser/sync/profile_sync_factory_impl.h',
+        'browser/sync/profile_sync_service.cc',
+        'browser/sync/profile_sync_service.h',
+        'browser/sync/signin_manager.cc',
+        'browser/sync/signin_manager.h',
         'browser/sync/sync_constants.cc',
         'browser/sync/sync_constants.h',
         'browser/sync/sync_setup_flow.cc',
@@ -2631,8 +2633,10 @@
         'browser/sync/sync_setup_wizard.h',
         'browser/sync/sync_ui_util.cc',
         'browser/sync/sync_ui_util.h',
+        'browser/sync/sync_ui_util_mac.h',
         'browser/sync/sync_ui_util_mac.mm',
-        'browser/sync/sync_ui_util_mac.h',
+        'browser/sync/token_migrator.cc',
+        'browser/sync/token_migrator.h',
         'browser/tab_closeable_state_watcher.cc',
         'browser/tab_closeable_state_watcher.h',
         'browser/tab_contents/background_contents.cc',