| Index: chrome/chrome.gyp
|
| ===================================================================
|
| --- chrome/chrome.gyp (revision 22331)
|
| +++ chrome/chrome.gyp (working copy)
|
| @@ -1583,6 +1583,30 @@
|
| 'browser/ssl/ssl_policy_backend.h',
|
| 'browser/ssl/ssl_request_info.h',
|
| 'browser/status_bubble.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/profile_sync_service.cc",
|
| + "browser/sync/profile_sync_service.h",
|
| + "browser/sync/glue/sync_backend_host.cc",
|
| + "browser/sync/glue/sync_backend_host.h",
|
| + "browser/sync/engine/syncapi.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/user_data_page_view.cc",
|
| + "browser/views/user_data_page_view.h",
|
| + "browser/sync/sync_status_ui_helper.cc",
|
| + "browser/sync/sync_status_ui_helper.h",
|
| + "browser/dom_ui/new_tab_page_sync_handler.cc",
|
| + "browser/dom_ui/new_tab_page_sync_handler.h",
|
| + "browser/sync/personalization.cc",
|
| + "browser/sync/personalization.h",
|
| + "browser/sync/personalization_strings.h",
|
| 'browser/tab_contents/constrained_window.h',
|
| 'browser/tab_contents/infobar_delegate.cc',
|
| 'browser/tab_contents/infobar_delegate.h',
|
| @@ -3903,6 +3927,10 @@
|
| '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/views/sync/sync_setup_wizard_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',
|
| @@ -4822,6 +4850,87 @@
|
| 'test/automation/window_proxy.h',
|
| ],
|
| },
|
| + {
|
| + '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',
|
|
|
|
|