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

logging.h to suppress the definition of LOG() and friends unless
explicitly requested. Fix gyp paths to overrides files.

Review URL: http://codereview.chromium.org/225001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27316 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 10 insertions, 8 deletions

diff --git a/chrome/browser/sync/notifier/gaia_auth/gaiaauth.cc b/chrome/browser/sync/notifier/gaia_auth/gaiaauth.cc
index cf30d07..8ff7c6f 100644
--- a/chrome/browser/sync/notifier/gaia_auth/gaiaauth.cc
+++ b/chrome/browser/sync/notifier/gaia_auth/gaiaauth.cc
@@ -4,11 +4,11 @@
 
 #include <string>
 
+#include "base/logging.h"
 #include "chrome/browser/sync/notifier/gaia_auth/gaiaauth.h"
 #include "talk/base/asynchttprequest.h"
 #include "talk/base/firewallsocketserver.h"
 #include "talk/base/httpclient.h"
-#include "talk/base/logging.h"
 #include "talk/base/physicalsocketserver.h"
 #include "talk/base/signalthread.h"
 #include "talk/base/socketadapters.h"
diff --git a/chrome/browser/sync/notifier/gaia_auth/gaiahelper.cc b/chrome/browser/sync/notifier/gaia_auth/gaiahelper.cc
index 9d5f4eb..f20f3ed 100644
--- a/chrome/browser/sync/notifier/gaia_auth/gaiahelper.cc
+++ b/chrome/browser/sync/notifier/gaia_auth/gaiahelper.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/notifier/gaia_auth/gaiahelper.h"
+#include "base/logging.h"
 #include "talk/base/common.h"
 #include "talk/base/cryptstring.h"
 #include "talk/base/httpclient.h"
@@ -147,9 +148,9 @@ GaiaResponse GaiaParseSidResponse(const talk_base::HttpClient& client,
     response.assign(stream->GetBuffer(), length);
   }
 
-  LOG(LS_INFO) << "GaiaAuth request to " << client.request().path;
-  LOG(LS_INFO) << "GaiaAuth Status Code: " << status_code;
-  LOG(LS_INFO) << response;
+  LOG(INFO) << "GaiaAuth request to " << client.request().path;
+  LOG(INFO) << "GaiaAuth Status Code: " << status_code;
+  LOG(INFO) << response;
 
   if (status_code == talk_base::HC_FORBIDDEN) {
     // The error URL may be the relative path to the captcha jpg.
diff --git a/chrome/browser/sync/notifier/gaia_auth/win/win32window.cc b/chrome/browser/sync/notifier/gaia_auth/win/win32window.cc
index 25ea0a3..720838e 100644
--- a/chrome/browser/sync/notifier/gaia_auth/win/win32window.cc
+++ b/chrome/browser/sync/notifier/gaia_auth/win/win32window.cc
@@ -4,10 +4,11 @@
 //
 // Originally from libjingle. Minor alterations to compile it in Chrome.
 
-#include "talk/base/common.h"
-#include "talk/base/logging.h"
 #include "talk/base/win32window.h"
 
+#include "base/logging.h"
+#include "talk/base/common.h"
+
 namespace talk_base {
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -42,7 +43,7 @@ bool Win32Window::Create(HWND parent, const wchar_t* title, DWORD style,
     wcex.lpszClassName = kWindowBaseClassName;
     window_class_ = ::RegisterClassEx(&wcex);
     if (!window_class_) {
-      LOG_GLE(LS_ERROR) << "RegisterClassEx failed";
+      LOG(ERROR) << "RegisterClassEx failed: " << GetLastError();
       return false;
     }
   }
@@ -97,7 +98,7 @@ LRESULT Win32Window::WndProc(HWND hwnd, UINT uMsg,
     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) {