Add the sync files to chrome.gyp. They still don't result in anything building because

the files are wrapped in #ifdef CHROME_PERSONALIZATION which is not defined anywhere at the moment.

Add live_sync to chrome\test and corresponding target to chrome.gyp

Review URL: http://codereview.chromium.org/159902

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22521 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 112 insertions, 0 deletions

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 5a099ce..d535d8b 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -918,6 +918,8 @@
         'browser/dom_ui/history_ui.h',
         'browser/dom_ui/html_dialog_ui.cc',
         'browser/dom_ui/html_dialog_ui.h',
+        'browser/dom_ui/new_tab_page_sync_handler.cc',
+        'browser/dom_ui/new_tab_page_sync_handler.h',
         'browser/dom_ui/new_tab_ui.cc',
         'browser/dom_ui/new_tab_ui.h',
         'browser/dom_ui/print_ui.cc',
@@ -1600,6 +1602,22 @@
         'browser/ssl/ssl_policy_backend.h',
         'browser/ssl/ssl_request_info.h',
         'browser/status_bubble.h',
+        'browser/sync/engine/syncapi.h',
+        'browser/sync/glue/bookmark_model_worker.cc',
+        'browser/sync/glue/bookmark_model_worker.h',
+        'browser/sync/glue/http_bridge.cc',
+        'browser/sync/glue/http_bridge.h',
+        'browser/sync/glue/model_associator.cc',
+        'browser/sync/glue/model_associator.h',
+        'browser/sync/glue/sync_backend_host.cc',
+        'browser/sync/glue/sync_backend_host.h',
+        'browser/sync/personalization.cc',
+        'browser/sync/personalization.h',
+        'browser/sync/personalization_strings.h',
+        'browser/sync/profile_sync_service.cc',
+        'browser/sync/profile_sync_service.h',
+        'browser/sync/sync_status_ui_helper.cc',
+        'browser/sync/sync_status_ui_helper.h',
         'browser/tab_contents/constrained_window.h',
         'browser/tab_contents/infobar_delegate.cc',
         'browser/tab_contents/infobar_delegate.h',
@@ -1814,6 +1832,8 @@
         'browser/views/options/passwords_exceptions_window_view.h',
         'browser/views/options/passwords_page_view.cc',
         'browser/views/options/passwords_page_view.h',
+        'browser/views/options/user_data_page_view.cc',
+        'browser/views/options/user_data_page_view.h',
         'browser/views/page_info_window_view.cc',
         'browser/views/panel_controller.cc',
         'browser/views/panel_controller.h',
@@ -1838,6 +1858,10 @@
         'browser/views/star_toggle.h',
         'browser/views/status_bubble_views.cc',
         'browser/views/status_bubble_views.h',
+        'browser/views/sync/sync_setup_flow.cc',
+        'browser/views/sync/sync_setup_flow.h',
+        'browser/views/sync/sync_setup_wizard.cc',
+        'browser/views/sync/sync_setup_wizard.h',
         'browser/views/tab_icon_view.cc',
         'browser/views/tab_icon_view.h',
         'browser/views/tab_contents/tab_contents_container.cc',
@@ -3786,6 +3810,9 @@
         'browser/sessions/tab_restore_service_unittest.cc',
         'browser/spellcheck_unittest.cc',
         'browser/ssl/ssl_host_state_unittest.cc',
+        'browser/sync/glue/bookmark_model_worker_unittest.cc',
+        'browser/sync/glue/http_bridge_unittest.cc',
+        'browser/sync/profile_sync_service_unittest.cc',
         'browser/tab_contents/navigation_controller_unittest.cc',
         'browser/tab_contents/navigation_entry_unittest.cc',
         'browser/tab_contents/render_view_host_manager_unittest.cc',
@@ -3797,6 +3824,7 @@
         'browser/utility_process_host_unittest.cc',
         'browser/views/bookmark_context_menu_test.cc',
         'browser/views/bookmark_editor_view_unittest.cc',
+        'browser/views/sync/sync_setup_wizard_unittest.cc',
         'browser/visitedlink_unittest.cc',
         'browser/webdata/web_database_unittest.cc',
         'browser/window_sizer_unittest.cc',
@@ -4765,6 +4793,90 @@
              'test/automation/window_proxy.h',
           ],
         },
+	{
+          # Windows-only for now; this has issues with scons
+          # regarding use of run_all_unittests.cc.
+          # TODO(zork): add target to linux build.
+          'target_name': 'live_sync_tests',
+          'type': 'executable',
+            'dependencies': [
+              'browser',
+              'chrome',
+              'chrome_resources',
+              'common',
+              'debugger',
+              'renderer',
+              'chrome_resources',
+              'chrome_strings',
+              'test_support_unit',
+              '../printing/printing.gyp:printing',
+              '../webkit/webkit.gyp:webkit',
+              '../skia/skia.gyp:skia',
+              '../testing/gtest.gyp:gtest',
+              '../third_party/icu38/icu38.gyp:icui18n',
+              '../third_party/icu38/icu38.gyp:icuuc',
+              '../third_party/libxml/libxml.gyp:libxml',
+              '../third_party/npapi/npapi.gyp:npapi',
+            ],
+            'include_dirs': [
+              '..',
+              '<(INTERMEDIATE_DIR)',
+            ],
+            'sources': [
+              'tools/build/win/precompiled_wtl.cc',
+              'tools/build/win/precompiled_wtl.h',
+              'test/live_sync/bookmark_model_verifier.cc',
+              'test/live_sync/bookmark_model_verifier.h',
+              'test/live_sync/live_bookmarks_sync_test.cc',
+              'test/live_sync/live_bookmarks_sync_test.h',
+              'test/live_sync/profile_sync_service_test_harness.cc',
+              'test/live_sync/profile_sync_service_test_harness.h',
+              'test/browser/run_all_unittests.cc',
+              'test/test_notification_tracker.cc',
+              'test/test_notification_tracker.h',
+              'test/testing_browser_process.h',
+              'test/ui_test_utils.cc',
+              'test/ui_test_utils.h',
+              'app/chrome_dll.rc',
+              'app/chrome_dll_resource.h',
+              'app/chrome_dll_version.rc.version',
+              'test/data/resource.h',
+              'test/data/resource.rc',
+              '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
+              '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
+              '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
+              'test/live_sync/single_client_live_bookmarks_sync_unittest.cc',
+              'test/live_sync/two_client_live_bookmarks_sync_test.cc',
+            ],
+            'conditions': [
+              # Plugin code.
+              ['OS=="linux" or OS=="win"', {
+                'dependencies': [
+                  'plugin',
+                 ],
+                'export_dependent_settings': [
+                  'plugin',
+                ],
+              }],
+              # Linux-specific rules.
+              ['OS=="linux"', {
+                 'dependencies': [
+                   '../build/linux/system.gyp:gtk',
+                 ],
+              }],
+              # Windows-specific rules.
+              ['OS=="win"', {
+                'include_dirs': [
+                  'third_party/wtl/include',
+                 ],
+                'dependencies': [
+                  'chrome_dll_version',
+                  'installer/installer.gyp:installer_util_strings',
+                  '../views/views.gyp:views',
+                ],
+              }],
+            ],
+	},
         {
           # Shared library used by the in-proc browser tests.
           'target_name': 'browser_tests_dll',