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

chrome/browser/sync/notifier/communicator/single_login_attempt.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.
 
 #include <string>
 
 #include "chrome/browser/sync/notifier/communicator/single_login_attempt.h"
 
+#include "base/logging.h"
 #include "chrome/browser/sync/notifier/communicator/connection_options.h"
 #include "chrome/browser/sync/notifier/communicator/connection_settings.h"
 #include "chrome/browser/sync/notifier/communicator/const_communicator.h"
 #include "chrome/browser/sync/notifier/communicator/login_failure.h"
 #include "chrome/browser/sync/notifier/communicator/login_settings.h"
 #include "chrome/browser/sync/notifier/communicator/product_info.h"
 #include "chrome/browser/sync/notifier/communicator/xmpp_connection_generator.h"
 #include "chrome/browser/sync/notifier/communicator/xmpp_socket_adapter.h"
 #include "chrome/browser/sync/notifier/gaia_auth/gaiaauth.h"
 #include "talk/base/asynchttprequest.h"
@@ skipping 437 matching lines @@
     SignalUnexpectedDisconnect();
     return;
   } else {
     HandleConnectionError(error, error_subcode, stream_error.get(),
                           captcha_challenge);
   }
 }
 
 void SingleLoginAttempt::HandleConnectionPasswordError(
     const buzz::CaptchaChallenge& captcha_challenge) {
-  LOG(LS_VERBOSE) << "SingleLoginAttempt::HandleConnectionPasswordError";
+  LOG(INFO) << "SingleLoginAttempt::HandleConnectionPasswordError";
 
   // Clear the auth cookie.
   std::string current_auth_cookie =
       login_settings_->user_settings().auth_cookie();
   login_settings_->modifiable_user_settings()->set_auth_cookie("");
   // If there was an auth cookie and it was the same as the last auth cookie,
   // then it is a stale cookie. Retry login.
   if (!current_auth_cookie.empty() && !cookie_refreshed_) {
     UseCurrentConnection();
     return;
   }
 
   LoginFailure failure(LoginFailure::XMPP_ERROR, code_, subcode_,
                        captcha_challenge);
   SignalLoginFailure(failure);
 }
 
 void SingleLoginAttempt::HandleConnectionError(
     buzz::XmppEngine::Error code,
     int subcode,
     const buzz::XmlElement* stream_error,
     const buzz::CaptchaChallenge& captcha_challenge) {
-  LOG_F(LS_VERBOSE) << "(" << code << ", " << subcode << ")";
+  LOG(INFO) << "(" << code << ", " << subcode << ")";
 
   // Save off the error code information, so we can use it to tell the user
   // what went wrong if all else fails.
   code_ = code;
   subcode_ = subcode;
   if ((code_ == buzz::XmppEngine::ERROR_UNAUTHORIZED) ||
       (code_ == buzz::XmppEngine::ERROR_MISSING_USERNAME)) {
     // There was a problem with credentials (username/password).
     HandleConnectionPasswordError(captcha_challenge);
     return;
@@ skipping 50 matching lines @@
   ASSERT(connection_generator_.get() != NULL);
   if (!connection_generator_.get()) {
     return;
   }
 
   // Iterate to the next possible connection (still trying to connect).
   UseNextConnection();
 }
 
 }  // namespace notifier