Merge ~santoshbit2007/oxide:cmd_line_extra into oxide:master

[Santosh]

This patch allow to extend default command-line argument passed to oxide
which can be done by setting environment variable OXIDE_EXTRA_CMD_ARGS
e.g export OXIDE_EXTRA_CMD_ARGS="enable-logging --v=1"

[Chris Coulson (chrisccoulson)]

This looks mostly ok - there's a couple of comments inline. I still think we should also have dedicated environment variables for tweaking the logging settings though (in addition to this).

review: Needs Fixing

[Chris Coulson (chrisccoulson)]

Thanks for the update. I've left some comments inline

review: Needs Fixing

[Chris Coulson (chrisccoulson)]

This is mostly ok, but see the 2 comments for InitVLogging. I think this bit (InitVLogging) should be split out to a separate merge proposal for now, as the rest of the change is fine to commit.

review: Needs Fixing

[Santosh (santoshbit2007)]

I drop plan to write log on file everytime as I feel its not required.
Its mostly developer feature and anyway we can redirect to file for logging

[Chris Coulson (chrisccoulson)]

review: Approve

diff --git a/shared/app/oxide_content_main_delegate.cc b/shared/app/oxide_content_main_delegate.cc
index edb0938..7de1ed6 100644
--- a/shared/app/oxide_content_main_delegate.cc
+++ b/shared/app/oxide_content_main_delegate.cc
@@ -58,6 +58,7 @@ bool ContentMainDelegate::BasicStartupComplete(int* exit_code) {
   content_client_.reset(new ContentClient());
   content::SetContentClient(content_client_.get());
   RegisterPathProvider();
+  InitVLogging();
 
   return false;
 }
@@ -152,4 +153,10 @@ ContentMainDelegate::CreateContentUtilityClient() {
   return content_utility_client_.get();
 }
 
+void ContentMainDelegate::InitVLogging() {
+  logging::LoggingSettings settings;
+  settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
+  logging::InitLogging(settings);
+}
+
 } // namespace oxide
diff --git a/shared/app/oxide_content_main_delegate.h b/shared/app/oxide_content_main_delegate.h
index 6796dc7..fc17b3f 100644
--- a/shared/app/oxide_content_main_delegate.h
+++ b/shared/app/oxide_content_main_delegate.h
@@ -47,6 +47,8 @@ class ContentMainDelegate final : public content::ContentMainDelegate {
   content::ContentUtilityClient* CreateContentUtilityClient() final;
 
  private:
+  void InitVLogging();
+
   PlatformDelegate* delegate_;
   std::unique_ptr<ContentBrowserClient> content_browser_client_;
   std::unique_ptr<ContentRendererClient> content_renderer_client_;
diff --git a/shared/browser/oxide_browser_process_main.cc b/shared/browser/oxide_browser_process_main.cc
index 3bf321f..71585d5 100644
--- a/shared/browser/oxide_browser_process_main.cc
+++ b/shared/browser/oxide_browser_process_main.cc
@@ -36,6 +36,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
 #include "base/posix/global_descriptors.h"
+#include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "cc/base/switches.h"
@@ -388,6 +389,31 @@ void InitializeCommandLine(const std::string& argv0,
   command_line->AppendSwitchPath(switches::kSharedMemoryOverridePath,
                                  GetSharedMemoryPath(env));
 #endif
+
+  // verbose logging
+  const std::string& verbose_log_level =
+      GetEnvironmentOption("VERBOSE_LOG_LEVEL", env);
+  if (!verbose_log_level.empty()) {
+    command_line->AppendSwitch(switches::kEnableLogging);
+    command_line->AppendSwitchASCII(switches::kV, verbose_log_level);
+  }
+
+  const std::string& extra_cmd_arg_list =
+      GetEnvironmentOption("EXTRA_CMD_ARGS", env);
+  if (!extra_cmd_arg_list.empty()) {
+    std::vector<std::string> args =
+        base::SplitString(extra_cmd_arg_list,
+                          base::kWhitespaceASCII,
+                          base::KEEP_WHITESPACE,
+                          base::SPLIT_WANT_NONEMPTY);
+
+    base::CommandLine::StringVector new_args;
+    new_args.push_back(command_line->argv()[0]);
+    new_args.insert(new_args.end(), args.begin(), args.end());
+
+    base::CommandLine extra_cmd_line(new_args);
+    command_line->AppendArguments(extra_cmd_line, false);
+  }
 }
 
 void AddFormFactorSpecificCommandLineArguments() {