Enable exporting SSLKEYLOGFILE on Android w/ command line arguments

chrome/browser/io_thread.cc

Index: chrome/browser/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 952964b1b79a7b16d32de582d06b4334a6b7086f..fe2ef5ab49fb2759e80606a2e777ddac09b96e4c 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -12,6 +12,7 @@
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/debug/leak_tracker.h"
+#include "base/environment.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_registry_simple.h"
@@ -80,6 +81,7 @@
 #include "net/quic/crypto/crypto_protocol.h"
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_utils.h"
+#include "net/socket/ssl_client_socket.h"
 #include "net/socket/tcp_client_socket.h"
 #include "net/spdy/spdy_session.h"
 #include "net/ssl/channel_id_service.h"
@@ -553,6 +555,36 @@ void IOThread::Init() {
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
 
+  std::string ssl_keylog_file;
+  scoped_ptr<base::Environment> env(base::Environment::Create());
+
+  if (command_line.HasSwitch(switches::kSSLKeyLogFile)) {
+    ssl_keylog_file = command_line.GetSwitchValueASCII(
+        switches::kSSLKeyLogFile);
+
+    std::string env_keylog_file;
+    if (env->GetVar("SSLKEYLOGFILE", &env_keylog_file) &&

[Bryan McQuade, 2015/10/15 01:05:26]

let's avoid looking up the env var twice. how about pulling this lookup up right
below the base::Environment::Create() line so we can avoid doing the lookup 2x.

something like:
scoped_ptr<base::Environment> env(base::Environment::Create());
std::string env_keylog_file;
env->GetVar("SSLKEYLOGFILE", &env_keylog_file);

std::string flag_keylog_file;
if (command_line.HasSwitch(switches::kSSLKeyLogFile)) {
  flag_keylog_file = command_line.GetSwitchValueASCII(...);
  if (flag_keylog_file.empty()) LOG(WARNING) << "...";
}

if (!env_keylog_file.empty() && !flag_keylog_file.empty())
  LOG(WARNING) << "...";

const std::string& keylog_file =
    !flag_keylog_file.empty() ? flag_keylog_file : env_keylog_file;
if (!keylog_file.empty()) {
  #if defined(USE_OPENSSL)
  ...
}

[Zhongyi Shi, 2015/10/15 02:02:04]

Done.

+        !env_keylog_file.empty()) {
+      if (ssl_keylog_file.empty()) {
+        LOG(WARNING) << "Commandline ssl-key-log-file argument empty, ignored.";
+        ssl_keylog_file = env_keylog_file;
+      } else {
+        LOG(WARNING) <<
+          "Environment variable SSLKEYLOGFILE is set but ignored.";
+      }
+    }
+  } else {
+    env->GetVar("SSLKEYLOGFILE", &ssl_keylog_file);
+  }
+
+  if (!ssl_keylog_file.empty()) {
+    #if defined(USE_OPENSSL)
+      net::SSLClientSocket::SetSSLKeyLogFile(ssl_keylog_file);
+    #else
+      DVLOG(1) << "Platform does not support openssl";
+    #endif
+  }
+
   DCHECK(!globals_);
   globals_ = new Globals;