Add ability for NetLogLogger to gather data from more than just NetLog

components/cronet/android/cronet_url_request_context_adapter.cc

 // Copyright 2014 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 "components/cronet/android/cronet_url_request_context_adapter.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/files/file_util.h"
+#include "base/files/scoped_file.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/values.h"
 #include "components/cronet/url_request_context_config.h"
 #include "jni/CronetUrlRequestContext_jni.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log_logger.h"
 #include "net/base/network_delegate_impl.h"
 #include "net/http/http_auth_handler_factory.h"
@@ skipping 257 matching lines @@
       base::Bind(&CronetURLRequestContextAdapter::StopNetLogOnNetworkThread,
                  base::Unretained(this)));
 }
 
 void CronetURLRequestContextAdapter::StartNetLogToFileOnNetworkThread(
     const std::string& file_name) {
   DCHECK(GetNetworkTaskRunner()->BelongsToCurrentThread());
   // Do nothing if already logging to a file.
   if (net_log_logger_)
     return;
-
   base::FilePath file_path(file_name);
-  FILE* file = base::OpenFile(file_path, "w");
+  base::ScopedFILE file(base::OpenFile(file_path, "w"));
   if (!file)
     return;
 
-  scoped_ptr<base::Value> constants(net::NetLogLogger::GetConstants());
-  net_log_logger_.reset(new net::NetLogLogger(file, *constants));
-  net_log_logger_->StartObserving(context_->net_log());
+  net_log_logger_.reset(new net::NetLogLogger());
+  net_log_logger_->StartObserving(context_->net_log(), file.Pass(), nullptr,
+                                  context_.get());
 }
 
 void CronetURLRequestContextAdapter::StopNetLogOnNetworkThread() {
   DCHECK(GetNetworkTaskRunner()->BelongsToCurrentThread());
   if (net_log_logger_) {
-    net_log_logger_->StopObserving();
+    net_log_logger_->StopObserving(context_.get());
     net_log_logger_.reset();
   }
 }
 
 // Creates RequestContextAdater if config is valid URLRequestContextConfig,
 // returns 0 otherwise.
 static jlong CreateRequestContextAdapter(JNIEnv* env,
                                          jclass jcaller,
                                          jstring jconfig) {
   std::string config_string =
       base::android::ConvertJavaStringToUTF8(env, jconfig);
   scoped_ptr<URLRequestContextConfig> context_config(
       new URLRequestContextConfig());
   if (!context_config->LoadFromJSON(config_string))
     return 0;
 
   CronetURLRequestContextAdapter* context_adapter =
       new CronetURLRequestContextAdapter(context_config.Pass());
   return reinterpret_cast<jlong>(context_adapter);
 }
 
 static jint SetMinLogLevel(JNIEnv* env, jclass jcaller, jint jlog_level) {
   jint old_log_level = static_cast<jint>(logging::GetMinLogLevel());
   // MinLogLevel is global, shared by all URLRequestContexts.
   logging::SetMinLogLevel(static_cast<int>(jlog_level));
   return old_log_level;
 }
 
 }  // namespace cronet