Refactor net::NetLog to provide implementation of observer pattern, not just the interface.

net/tools/gdig/gdig.cc

 // Copyright (c) 2012 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 <stdio.h>
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/cancelable_callback.h"
@@ skipping 164 matching lines @@
     entry.start_time = delta;
     entry.domain_name = time_and_name[1];
     replay_log->push_back(entry);
   }
   return !bad_parse;
 }
 
 class GDig {
  public:
   GDig();
+  ~GDig();
 
   enum Result {
     RESULT_NO_RESOLVE = -3,
     RESULT_NO_CONFIG = -2,
     RESULT_WRONG_USAGE = -1,
     RESULT_OK = 0,
     RESULT_PENDING = 1,
   };
 
   Result Main(int argc, const char* argv[]);
@@ skipping 17 matching lines @@
   base::TimeDelta timeout_;
   int parallellism_;
   ReplayLog replay_log_;
   unsigned replay_log_index_;
   base::Time start_time_;
   int active_resolves_;
   Result result_;
 
   base::CancelableClosure timeout_closure_;
   scoped_ptr<DnsConfigService> dns_config_service_;
-  scoped_ptr<FileNetLog> log_;
+  scoped_ptr<FileNetLogObserver> log_observer_;
+  scoped_ptr<NetLog> log_;
   scoped_ptr<HostResolver> resolver_;
 };
 
 GDig::GDig()
     : config_timeout_(base::TimeDelta::FromSeconds(5)),
       print_config_(false),
       print_hosts_(false),
       parallellism_(6),
       replay_log_index_(0u),
       active_resolves_(0) {
 }
 
+GDig::~GDig() {
+  if(log_)

[mmenke, 2013/05/30 18:18:59]

nit:  Space after if.

[kouhei (in TOK), 2013/05/31 06:30:03]

Done.

+    log_->RemoveThreadSafeObserver(log_observer_.get());
+}
+
 GDig::Result GDig::Main(int argc, const char* argv[]) {
   if (!ParseCommandLine(argc, argv)) {
       fprintf(stderr,
               "usage: %s [--net_log[=<basic|no_bytes|all>]]"
               " [--print_config] [--print_hosts]"
               " [--nameserver=<ip_address[:port]>]"
               " [--timeout=<milliseconds>]"
               " [--config_timeout=<seconds>]"
               " [--j=<parallel resolves>]"
               " [--replay_file=<path>]"
@@ skipping 47 matching lines @@
       log_levels["no_bytes"] = NetLog::LOG_ALL_BUT_BYTES;
       log_levels["basic"] = NetLog::LOG_BASIC;
 
       if (log_levels.find(log_param) != log_levels.end()) {
         level = log_levels[log_param];
       } else {
         fprintf(stderr, "Invalid net_log parameter\n");
         return false;
       }
     }
-    log_.reset(new FileNetLog(stderr, level));
+    log_.reset(new NetLog);
+    log_observer_.reset(new FileNetLogObserver(stderr));
+    log_->AddThreadSafeObserver(log_observer_.get(), level);
   }
 
   print_config_ = parsed_command_line.HasSwitch("print_config");
   print_hosts_ = parsed_command_line.HasSwitch("print_hosts");
 
   if (parsed_command_line.HasSwitch("nameserver")) {
     std::string nameserver =
       parsed_command_line.GetSwitchValueASCII("nameserver");
     if (!StringToIPEndPoint(nameserver, &nameserver_)) {
       fprintf(stderr,
@@ skipping 178 matching lines @@
 }
 
 }  // empty namespace
 
 }  // namespace net
 
 int main(int argc, const char* argv[]) {
   net::GDig dig;
   return dig.Main(argc, argv);
 }