Modify Chromoting logging to hook into base logging.

remoting/host/chromoting_host.h

 // Copyright (c) 2011 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.
 
 #ifndef REMOTING_CHROMOTING_HOST_H_
 #define REMOTING_CHROMOTING_HOST_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 18 matching lines @@
 class HostStub;
 class InputStub;
 class SessionConfig;
 class CandidateSessionConfig;
 }  // namespace protocol
 
 class Capturer;
 class ChromotingHostContext;
 class DesktopEnvironment;
 class Encoder;
-class Logger;
 class MutableHostConfig;
 class ScreenRecorder;
 
 // A class to implement the functionality of a host process.
 //
 // Here's the work flow of this class:
 // 1. We should load the saved GAIA ID token or if this is the first
 //    time the host process runs we should prompt user for the
 //    credential. We will use this token or credentials to authenicate
 //    and register the host.
@@ skipping 17 matching lines @@
                        public protocol::ConnectionToClient::EventHandler,
                        public ClientSession::EventHandler,
                        public SignalStrategy::StatusObserver {
  public:
   // Factory methods that must be used to create ChromotingHost instances.
   // Default capturer and input stub are used if it is not specified.
   // Returned instance takes ownership of |access_verifier| and |environment|,
   // and adds a reference to |config|. It does NOT take ownership of |context|.
   static ChromotingHost* Create(ChromotingHostContext* context,
                                 MutableHostConfig* config,
-                                AccessVerifier* access_verifier,
-                                Logger* logger);
+                                AccessVerifier* access_verifier);
   static ChromotingHost* Create(ChromotingHostContext* context,
                                 MutableHostConfig* config,
                                 DesktopEnvironment* environment,
-                                AccessVerifier* access_verifier,
-                                Logger* logger);
+                                AccessVerifier* access_verifier);
 
   // Asynchronously start the host process.
   //
   // After this is invoked, the host process will connect to the talk
   // network and start listening for incoming connections.
   //
   // This method can only be called once during the lifetime of this object.
   void Start();
 
   // Asynchronously shutdown the host process. |shutdown_task| is
@@ skipping 20 matching lines @@
       SignalStrategy::StatusObserver::State state) OVERRIDE;
   virtual void OnJidChange(const std::string& full_jid) OVERRIDE;
 
   ////////////////////////////////////////////////////////////////////////////
   // ClientSession::EventHandler implementation.
   virtual void LocalLoginSucceeded(
       scoped_refptr<protocol::ConnectionToClient> client);
   virtual void LocalLoginFailed(
       scoped_refptr<protocol::ConnectionToClient> client);
 
-  Logger* logger() { return logger_; }
-
   // Callback for ChromotingServer.
   void OnNewClientSession(
       protocol::Session* session,
       protocol::SessionManager::IncomingSessionResponse* response);
 
   // Sets desired configuration for the protocol. Ownership of the
   // |config| is transferred to the object. Must be called before Start().
   void set_protocol_config(protocol::CandidateSessionConfig* config);
 
   // TODO(wez): ChromotingHost shouldn't need to know about Me2Mom.
@@ skipping 14 matching lines @@
   friend class ChromotingHostTest;
 
   typedef std::vector<HostStatusObserver*> StatusObserverList;
   typedef std::vector<scoped_refptr<ClientSession> > ClientList;
 
   // Takes ownership of |access_verifier| and |environment|, and adds a
   // reference to |config|. Does NOT take ownership of |context|.
   ChromotingHost(ChromotingHostContext* context,
                  MutableHostConfig* config,
                  DesktopEnvironment* environment,
-                 AccessVerifier* access_verifier,
-                 Logger* logger);
+                 AccessVerifier* access_verifier);
   virtual ~ChromotingHost();
 
   enum State {
     kInitial,
     kStarted,
     kStopping,
     kStopped,
   };
 
   // This method is called if a client is disconnected from the host.
@@ skipping 26 matching lines @@
   scoped_ptr<SignalStrategy> signal_strategy_;
 
   std::string local_jid_;
 
   scoped_ptr<protocol::SessionManager> session_manager_;
 
   StatusObserverList status_observers_;
 
   scoped_ptr<AccessVerifier> access_verifier_;
 
-  // Logger (owned by the HostNPScriptObject).
-  Logger* logger_;
-
   // The connections to remote clients.
   ClientList clients_;
 
   // Session manager for the host process.
   scoped_refptr<ScreenRecorder> recorder_;
 
   // Tracks the internal state of the host.
   // This variable is written on the main thread of ChromotingHostContext
   // and read by jingle thread.
   State state_;
@@ skipping 13 matching lines @@
   // Stores list of tasks that should be executed when we finish
   // shutdown. Used only while |state_| is set to kStopping.
   std::vector<Task*> shutdown_tasks_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingHost);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_CHROMOTING_HOST_H_