Reverting 17273 - Fails reliability tests

chrome/chrome.gyp

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
     # Define the common dependencies that contain all the actual
     # Chromium functionality.  This list gets pulled in below by
     # the link of the actual chrome (or chromium) executable on
@@ skipping 1073 matching lines @@
         'browser/page_state.cc',
         'browser/page_state.h',
         'browser/password_manager/encryptor_linux.cc',
         'browser/password_manager/encryptor_mac.mm',
         'browser/password_manager/encryptor_win.cc',
         'browser/password_manager/encryptor.h',
         'browser/password_manager/ie7_password.cc',
         'browser/password_manager/ie7_password.h',
         'browser/password_manager/password_form_manager.cc',
         'browser/password_manager/password_form_manager.h',
+        'browser/password_manager/password_form_manager_win.cc',
         'browser/password_manager/password_manager.cc',
         'browser/password_manager/password_manager.h',
-        'browser/password_manager/password_store.cc',
-        'browser/password_manager/password_store.h',
-        'browser/password_manager/password_store_default.cc',
-        'browser/password_manager/password_store_default.h',
-        # Temporarily disabled while we figure some stuff out.
-        # http://code.google.com/p/chromium/issues/detail?id=12351
-        # 'browser/password_manager/password_store_gnome.h',
-        # 'browser/password_manager/password_store_gnome.cc',
-        # 'browser/password_manager/password_store_kwallet.h',
-        # 'browser/password_manager/password_store_kwallet.cc',
-        'browser/password_manager/password_store_mac_internal.h',
-        'browser/password_manager/password_store_mac.h',
-        'browser/password_manager/password_store_mac.cc',
-        'browser/password_manager/password_store_win.h',
-        'browser/password_manager/password_store_win.cc',
         'browser/plugin_installer.cc',
         'browser/plugin_installer.h',
         'browser/plugin_process_host.cc',
         'browser/plugin_process_host.h',
         'browser/plugin_service.cc',
         'browser/plugin_service.h',
         'browser/printing/page_number.cc',
         'browser/printing/page_number.h',
         'browser/printing/page_overlays.cc',
         'browser/printing/page_overlays.h',
@@ skipping 439 matching lines @@
         '<(SHARED_INTERMEDIATE_DIR)/chrome/grit/theme_resources_map.cc',
       ],
       'conditions': [
         ['javascript_engine=="v8"', {
           'defines': [
             'CHROME_V8',
           ],
         }],
         ['OS=="linux"', {
           'dependencies': [
-            # Temporarily disabled while we figure some stuff out.
-            # http://code.google.com/p/chromium/issues/detail?id=12351
-            # '../build/linux/system.gyp:dbus-glib',
-            # '../build/linux/system.gyp:gnome-keyring',
             '../build/linux/system.gyp:gtk',
           ],
           'sources!': [
             'browser/extensions/extension_shelf.cc',
             'browser/extensions/extension_shelf.h',
             'browser/extensions/extension_view.cc',
             'browser/extensions/extension_view.h',
                     # Windows-specific files.
-            'browser/password_manager/password_store_win.cc',
-            'browser/password_manager/password_store_win.h',
           ],
           'conditions': [
             ['linux_breakpad==1', {
               'sources': [
                 'browser/renderer_host/render_crash_handler_host_linux.cc',
                 'app/breakpad_linux.cc',
                 'app/breakpad_linux.h',
               ],
               'dependencies': [
                 '../breakpad/breakpad.gyp:breakpad_client',
@@ skipping 22 matching lines @@
             ['exclude', '^browser/download/'],
             ['include', '^browser/download/download_(file|manager|shelf)\\.cc$'],
             ['include', '^browser/download/download_request_manager\\.cc$'],
             ['include', '^browser/download/download_item_model\\.cc$'],
             ['include', '^browser/download/save_(file(_manager)?|item|package)\\.cc$'],
           ],
           'sources!': [
             'browser/automation/automation_provider_list_generic.cc',
             'browser/bookmarks/bookmark_context_menu.cc',
             'browser/bookmarks/bookmark_drop_info.cc',
-            'browser/password_manager/password_store_gnome.h',
-            'browser/password_manager/password_store_gnome.cc',
-            'browser/password_manager/password_store_kwallet.h',
-            'browser/password_manager/password_store_kwallet.cc',
-            'browser/password_manager/password_store_win.cc',
-            'browser/password_manager/password_store_win.h',
             'browser/extensions/extension_shelf.cc',
             'browser/extensions/extension_shelf.h',
             'browser/extensions/extension_view.cc',
             'browser/extensions/extension_view.h',
           ],
           'sources': [
             # Build the necessary GTM sources
             '../third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.m',
             '../third_party/GTM/AppKit/GTMNSColor+Luminance.m',
             '../third_party/GTM/AppKit/GTMTheme.m',
@@ skipping 31 matching lines @@
           ],
           'export_dependent_settings': [
             '../views/views.gyp:views',
           ],
           'sources': [
             # Using built-in rule in vstudio for midl.
             'browser/history/history_indexer.idl',
           ],
           'sources!': [
             'browser/history/history_publisher_none.cc',
-            'browser/password_manager/password_store_gnome.h',
-            'browser/password_manager/password_store_gnome.cc',
-            'browser/password_manager/password_store_kwallet.h',
-            'browser/password_manager/password_store_kwallet.cc',
           ],
           'configurations': {
             'Debug': {
               'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
               'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
             },
           },
         }, {  # 'OS!="win"
           'sources/': [
             # Exclude all of hang_monitor.
@@ skipping 1435 matching lines @@
         'browser/net/chrome_url_request_context_unittest.cc',
         'browser/net/dns_host_info_unittest.cc',
         'browser/net/dns_master_unittest.cc',
         'browser/net/resolve_proxy_msg_helper_unittest.cc',
         'browser/net/test_url_fetcher_factory.cc',
         'browser/net/test_url_fetcher_factory.h',
         'browser/net/url_fetcher_unittest.cc',
         'browser/net/url_fixer_upper_unittest.cc',
         'browser/password_manager/encryptor_unittest.cc',
         'browser/password_manager/password_form_manager_unittest.cc',
-        'browser/password_manager/password_store_mac_unittest.cc',
         'browser/printing/page_number_unittest.cc',
         'browser/printing/page_overlays_unittest.cc',
         'browser/printing/page_range_unittest.cc',
         'browser/printing/page_setup_unittest.cc',
         'browser/printing/print_job_unittest.cc',
         'browser/printing/win_printing_context_unittest.cc',
         'browser/profile_manager_unittest.cc',
         'browser/renderer_host/audio_renderer_host_unittest.cc',
         'browser/renderer_host/render_view_host_unittest.cc',
         'browser/renderer_host/render_widget_host_unittest.cc',
@@ skipping 1122 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],
   ],  # 'conditions'
 }