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

chrome/browser/sync/notifier/gaia_auth/win/win32window.cc

 // 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.
 //
 // Originally from libjingle. Minor alterations to compile it in Chrome.
 
+#include "talk/base/win32window.h"
+#include "base/logging.h"

[brg, 2009/09/23 18:14:26]

You are missing a blank line betwixt this modules header and base/logging.h

[ncarter (slow), 2009/09/23 20:28:36]

Done.

 #include "talk/base/common.h"
-#include "talk/base/logging.h"
-#include "talk/base/win32window.h"
 
 namespace talk_base {
 
 ///////////////////////////////////////////////////////////////////////////////
 // Win32Window
 ///////////////////////////////////////////////////////////////////////////////
 
 static const wchar_t kWindowBaseClassName[] = L"WindowBaseClass";
 HINSTANCE instance_ = GetModuleHandle(NULL);
 ATOM window_class_ = 0;
@@ skipping 15 matching lines @@
   if (!window_class_) {
     // Class not registered, register it.
     WNDCLASSEX wcex;
     memset(&wcex, 0, sizeof(wcex));
     wcex.cbSize = sizeof(wcex);
     wcex.hInstance = instance_;
     wcex.lpfnWndProc = &Win32Window::WndProc;
     wcex.lpszClassName = kWindowBaseClassName;
     window_class_ = ::RegisterClassEx(&wcex);
     if (!window_class_) {
-      LOG_GLE(LS_ERROR) << "RegisterClassEx failed";
+      LOG(ERROR) << "RegisterClassEx failed: " << GetLastError();
       return false;
     }
   }
   wnd_ = ::CreateWindowEx(exstyle, kWindowBaseClassName, title, style,
                           x, y, cx, cy, parent, NULL, instance_, this);
   return (NULL != wnd_);
 }
 
 void Win32Window::Destroy() {
   VERIFY(::DestroyWindow(wnd_) != FALSE);
@@ skipping 34 matching lines @@
     that = static_cast<Win32Window*>(cs->lpCreateParams);
     that->wnd_ = hwnd;
     ::SetWindowLongPtr(hwnd, GWL_USERDATA, reinterpret_cast<LONG_PTR>(that));
   }
   if (that) {
     LRESULT result;
     bool handled = that->OnMessage(uMsg, wParam, lParam, result);
     if (WM_DESTROY == uMsg) {
       for (HWND child = ::GetWindow(hwnd, GW_CHILD); child;
            child = ::GetWindow(child, GW_HWNDNEXT)) {
-        LOG(LS_INFO) << "Child window: " << static_cast<void*>(child);
+        LOG(INFO) << "Child window: " << static_cast<void*>(child);
       }
     }
     if (WM_NCDESTROY == uMsg) {
       ::SetWindowLongPtr(hwnd, GWL_USERDATA, NULL);
       that->wnd_ = NULL;
       that->OnDestroyed();
     }
     if (handled) {
       return result;
     }
   }
   return ::DefWindowProc(hwnd, uMsg, wParam, lParam);
 }
 
 }  // namespace talk_base