Use base/logging from chrome/browser/sync. Add a macro to libjingle's

third_party/libjingle/libjingle.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.
 
 {
   'includes': [
     '../../build/common.gypi',
   ],
   'target_defaults': {
     'defines': [
       'FEATURE_ENABLE_SSL',
       'FEATURE_ENABLE_VOICEMAIL',  # TODO(ncarter): Do we really need this?
       '_USE_32BIT_TIME_T',
+      'SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS',
     ],
     'include_dirs': [
       './overrides',
       './files',
     ],
     'dependencies': [
       '../expat/expat.gyp:expat',
       '../../base/base.gyp:base',
     ],
     'direct_dependent_settings': {
@@ skipping 210 matching lines @@
         'files/talk/xmpp/xmppengineimpl.cc',
         'files/talk/xmpp/xmppengineimpl.h',
         'files/talk/xmpp/xmppengineimpl_iq.cc',
         'files/talk/xmpp/xmppengineimpl_iq.h',
         'files/talk/xmpp/xmpplogintask.cc',
         'files/talk/xmpp/xmpplogintask.h',
         'files/talk/xmpp/xmppstanzaparser.cc',
         'files/talk/xmpp/xmppstanzaparser.h',
         'files/talk/xmpp/xmpptask.cc',
         'files/talk/xmpp/xmpptask.h',
-        'overrides/base/basictypes.h',
-        'overrides/base/constructormagic.h',
-        'overrides/base/scoped_ptr.h',
+        'overrides/talk/base/basictypes.h',
+        'overrides/talk/base/constructormagic.h',
+        'overrides/talk/base/scoped_ptr.h',
         'overrides/config.h',
       ],
       'conditions': [
         ['OS=="win"', {
           'sources': [
             'files/talk/base/convert.h',  # win32 only
             'files/talk/base/diskcache_win32.cc',  # win32 only
             'files/talk/base/diskcache_win32.h',   # win32 only
             'files/talk/base/schanneladapter.cc',
             'files/talk/base/schanneladapter.h',
             'files/talk/base/win32.h',
             'files/talk/base/win32filesystem.cc',
             'files/talk/base/win32filesystem.h',
             'files/talk/base/win32socketserver.cc',
             'files/talk/base/win32socketserver.h',
             'files/talk/base/win32window.h',
             'files/talk/base/winfirewall.cc',
             'files/talk/base/winfirewall.h',
             'files/talk/base/winping.cc',
             'files/talk/base/winping.h',
           ],
         }],
       ],
     },
   ],
 }