Move gin and v8 portion of profiling to child from common

chrome/app/chrome_main_delegate.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 "chrome/app/chrome_main_delegate.h"
 
 #include <stddef.h>
 #include <string>
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/cpu.h"
 #include "base/files/file_path.h"
 #include "base/i18n/rtl.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/path_service.h"
 #include "base/process/memory.h"
 #include "base/process/process_handle.h"
 #include "base/process/process_info.h"
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event_impl.h"
 #include "build/build_config.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/defaults.h"
+#include "chrome/child/child_profiling.h"
 #include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_result_codes.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/crash_keys.h"
 #include "chrome/common/features.h"
 #include "chrome/common/logging_chrome.h"
@@ skipping 482 matching lines @@
 #if defined(OS_MACOSX)
   // Give the browser process a longer treadmill, since crashes
   // there have more impact.
   const bool is_browser = !command_line.HasSwitch(switches::kProcessType);
   ObjcEvilDoers::ZombieEnable(true, is_browser ? 10000 : 1000);
 
   SetUpBundleOverrides();
   chrome::common::mac::EnableCFBundleBlocker();
 #endif
 
+#if !defined(CHROME_MULTIPLE_DLL_BROWSER)

[Nico, 2017/01/13 21:01:19]

if this is mechanical, why does this have the !defined but the other place below
doesn't? (feels like a stupid question, sorry)

[scottmg, 2017/01/13 21:55:08]

You're right, not entirely mechanical I guess. This one runs on all
platforms(-ish). This code is built twice on Windows, once for child and once
for browser, so the define breaks the dependency on the child-only code when
it's built for the browser.

The Zygote one below is in #if POSIX. Strictly speaking I guess it could have
!CHROME_MULTIPLE_DLL_BROWSER too, but it would be more confusing than anything
because that define only really makes sense on Windows.

[Nico, 2017/01/17 13:10:42]

Maybe add a comment explaining why this is ifdef'd and the other isn't (but up
to you; if you think it's more confusing with a comment, omit it)

+  ChildProfiling::ProcessStarted();
+#endif
   Profiling::ProcessStarted();
 
   base::trace_event::TraceLog::GetInstance()->SetArgumentFilterPredicate(
       base::Bind(&IsTraceEventArgsWhitelisted));
 
 #if defined(OS_WIN) && !defined(CHROME_MULTIPLE_DLL_BROWSER)
   v8_breakpad_support::SetUp();
 #endif
 
 #if defined(OS_POSIX)
@@ skipping 469 matching lines @@
 #if defined(OS_CHROMEOS)
     chromeos::ReloadElfTextInHugePages();
 #endif
 
 #if !defined(DISABLE_NACL)
   nacl::AddNaClZygoteForkDelegates(delegates);
 #endif
 }
 
 void ChromeMainDelegate::ZygoteForked() {
+  ChildProfiling::ProcessStarted();
   Profiling::ProcessStarted();
   if (Profiling::BeingProfiled()) {
     base::debug::RestartProfilingAfterFork();
     SetUpProfilingShutdownHandler();
   }
 
   // Needs to be called after we have chrome::DIR_USER_DATA.  BrowserMain sets
   // this up for the browser process in a different manner.
   const base::CommandLine* command_line =
       base::CommandLine::ForCurrentProcess();
@@ skipping 48 matching lines @@
     case version_info::Channel::CANARY:
       return true;
     case version_info::Channel::DEV:
     case version_info::Channel::BETA:
     case version_info::Channel::STABLE:
     default:
       // Don't enable instrumentation.
       return false;
   }
 }