Bring the GYP-based build up to the current state of the trunk.

base/base.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,
   },
   'includes': [
     '../build/common.gypi',
@@ skipping 298 matching lines @@
               # Linux has an implementation of idle_timer that depends
               # on XScreenSaver, but it's unclear if we want it yet,
               # so use idle_timer_none.cc instead.
               'idle_timer.cc',
             ],
             'cflags': ['-Wno-write-strings'],
           },
           {  # else: OS != "linux"
             'sources!': [
               'atomicops_internals_x86_gcc.cc',
-              'data_pack.cc',
               'hmac_nss.cc',
               'idle_timer_none.cc',
               'message_pump_glib.cc',
               'nss_init.cc',
               'time_posix.cc',
             ],
           }
         ],
         [ 'OS == "mac"', {
             'sources/': [ ['exclude', '_(linux|win)\\.cc$'] ],
             'sources!': [
               'worker_pool.cc',
             ],
             'link_settings': {
               'libraries': [
                 '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
                 '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
                 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
                 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
               ],
             },
           },
         ],
         [ 'OS == "win"', {
             'sources/': [ ['exclude', '_(linux|mac|posix)\\.cc$'],
                           ['exclude', '\\.mm?$' ] ],
             'sources!': [
+              'data_pack.cc',
               'event_recorder_stubs.cc',
               'message_pump_libevent.cc',
               'string16.cc',
             ],
           },
           {  # else: OS != "win"
             'dependencies': ['../third_party/libevent/libevent.gyp:libevent'],
             'sources!': [
               'third_party/purify/pure_api.c',
               'base_drag_source.cc',
@@ skipping 205 matching lines @@
           'target_name': 'debug_message',
           'type': 'executable',
           'sources': [
             'debug_message.cc',
           ],
         },
       ],
     }],
   ],
 }