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

chrome/browser/sync/notifier/communicator/xmpp_socket_adapter.cc

Index: chrome/browser/sync/notifier/communicator/xmpp_socket_adapter.cc
diff --git a/chrome/browser/sync/notifier/communicator/xmpp_socket_adapter.cc b/chrome/browser/sync/notifier/communicator/xmpp_socket_adapter.cc
index fbdf600dd374d8f9f09161d261e1753fcb559965..03c1977557ad5603cda249c30fff1c0805c3413c 100644
--- a/chrome/browser/sync/notifier/communicator/xmpp_socket_adapter.cc
+++ b/chrome/browser/sync/notifier/communicator/xmpp_socket_adapter.cc
@@ -7,6 +7,7 @@
 #include <iomanip>
 #include <string>
 
+#include "base/logging.h"
 #include "chrome/browser/sync/notifier/communicator/product_info.h"
 #include "talk/base/byteorder.h"
 #include "talk/base/common.h"
@@ -74,7 +75,7 @@ bool XmppSocketAdapter::Connect(const talk_base::SocketAddress& addr) {
     return false;
   }
 
-  LOG(LS_INFO) << "XmppSocketAdapter::Connect(" << addr.ToString() << ")";
+  LOG(INFO) << "XmppSocketAdapter::Connect(" << addr.ToString() << ")";
 
   // Clean up any previous socket - cannot delete socket on close because close
   // happens during the child socket's stack callback.
@@ -248,8 +249,8 @@ bool XmppSocketAdapter::Close() {
   if (state_ != STATE_CLOSED) {
     // The socket was closed manually, not directly due to error.
     if (error_ != ERROR_NONE) {
-      LOG(LS_INFO) << "XmppSocketAdapter::Close - previous Error: " << error_
-                   << " WSAError: " << wsa_error_;
+      LOG(INFO) << "XmppSocketAdapter::Close - previous Error: " << error_
+                << " WSAError: " << wsa_error_;
       error_ = ERROR_NONE;
       wsa_error_ = 0;
     }
@@ -262,8 +263,8 @@ void XmppSocketAdapter::NotifyClose() {
   if (state_ == STATE_CLOSED) {
     SetError(ERROR_WRONGSTATE);
   } else {
-    LOG(LS_INFO) << "XmppSocketAdapter::NotifyClose - Error: " << error_
-                 << " WSAError: " << wsa_error_;
+    LOG(INFO) << "XmppSocketAdapter::NotifyClose - Error: " << error_
+              << " WSAError: " << wsa_error_;
     state_ = STATE_CLOSED;
     SignalClosed();
     FreeState();
@@ -273,19 +274,19 @@ void XmppSocketAdapter::NotifyClose() {
 void XmppSocketAdapter::OnConnectEvent(talk_base::AsyncSocket *socket) {
   if (state_ == STATE_CONNECTING) {
     state_ = STATE_OPEN;
-    LOG(LS_INFO) << "XmppSocketAdapter::OnConnectEvent - STATE_OPEN";
+    LOG(INFO) << "XmppSocketAdapter::OnConnectEvent - STATE_OPEN";
     SignalConnected();
 #if defined(FEATURE_ENABLE_SSL)
   } else if (state_ == STATE_TLS_CONNECTING) {
     state_ = STATE_TLS_OPEN;
-    LOG(LS_INFO) << "XmppSocketAdapter::OnConnectEvent - STATE_TLS_OPEN";
+    LOG(INFO) << "XmppSocketAdapter::OnConnectEvent - STATE_TLS_OPEN";
     SignalSSLConnected();
     if (write_buffer_length_ > 0) {
       HandleWritable();
     }
 #endif  // defined(FEATURE_ENABLE_SSL)
   } else {
-    LOG(LS_INFO) << "XmppSocketAdapter::OnConnectEvent - state is " << state_;
+    LOG(INFO) << "XmppSocketAdapter::OnConnectEvent - state is " << state_;
     ASSERT(false);
   }
 }
@@ -300,7 +301,7 @@ void XmppSocketAdapter::OnWriteEvent(talk_base::AsyncSocket *socket) {
 
 void XmppSocketAdapter::OnCloseEvent(talk_base::AsyncSocket *socket,
                                      int error) {
-  LOG(LS_INFO) << "XmppSocketAdapter::OnCloseEvent(" << error << ")";
+  LOG(INFO) << "XmppSocketAdapter::OnCloseEvent(" << error << ")";
   SetWSAError(error);
   if (error == SOCKET_EACCES) {
     SignalAuthenticationError();  // Proxy needs authentication.