headless: Log to user profile directory in release builds

BUG=824964

Change-Id: I4a3fb472361b8548317c42afbe09b117e25fd178
Reviewed-on: https://chromium-review.googlesource.com/984879
Commit-Queue: Sami Kyöstilä <skyostil@chromium.org>
Reviewed-by: Eric Seckler <eseckler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#547835}

headless/lib/browser/headless_browser_context_impl.cc

@@ -209,8 +209,7 @@ void HeadlessBrowserContextImpl::Close() {
 
 void HeadlessBrowserContextImpl::InitWhileIOAllowed() {
   if (!context_options_->user_data_dir().empty()) {
-    path_ =
-        context_options_->user_data_dir().Append(FILE_PATH_LITERAL("Default"));
+    path_ = context_options_->user_data_dir().Append(kDefaultProfileName);
   } else {
     PathService::Get(base::DIR_EXE, &path_);
   }

headless/lib/browser/headless_browser_impl.cc

@@ -70,6 +70,9 @@ int RunContentMain(
 
 }  // namespace
 
+const base::FilePath::CharType kDefaultProfileName[] =
+    FILE_PATH_LITERAL("Default");
+
 HeadlessBrowserImpl::HeadlessBrowserImpl(
     base::OnceCallback<void(HeadlessBrowser*)> on_start_callback,
     HeadlessBrowser::Options options)

headless/lib/browser/headless_browser_impl.h

@@ -33,6 +33,8 @@ namespace headless {
 class HeadlessBrowserContextImpl;
 class HeadlessBrowserMainParts;
 
+extern const base::FilePath::CharType kDefaultProfileName[];
+
 // Exported for tests.
 class HEADLESS_EXPORT HeadlessBrowserImpl : public HeadlessBrowser,
                                             public HeadlessDevToolsTarget {

headless/lib/headless_content_main_delegate.cc

@@ -160,10 +160,23 @@ void HeadlessContentMainDelegate::InitLogging(
   base::FilePath log_path;
   logging::LoggingSettings settings;
 
-  if (PathService::Get(base::DIR_MODULE, &log_path)) {
+// In release builds we should log into the user profile directory.
+#ifdef NDEBUG
+  if (!browser_->options()->user_data_dir.empty()) {
+    log_path = browser_->options()->user_data_dir;
+    log_path = log_path.Append(kDefaultProfileName);
+    base::CreateDirectory(log_path);
     log_path = log_path.Append(log_filename);
-  } else {
-    log_path = log_filename;
+  }
+#endif  // NDEBUG
+
+  // Otherwise we log to where the executable is.
+  if (log_path.empty()) {
+    if (PathService::Get(base::DIR_MODULE, &log_path)) {
+      log_path = log_path.Append(log_filename);
+    } else {
+      log_path = log_filename;
+    }
   }
 
   std::string filename;