Break chrome_initial's dependence on //components/startup_metric_utils/browser:lib

chrome/app/main_dll_loader_win.cc

Index: chrome/app/main_dll_loader_win.cc
diff --git a/chrome/app/main_dll_loader_win.cc b/chrome/app/main_dll_loader_win.cc
index 38a858f4453e110450f969faabde535ab575dcd2..ef34457b52eb4824446a2e31e0da569dff8dae22 100644
--- a/chrome/app/main_dll_loader_win.cc
+++ b/chrome/app/main_dll_loader_win.cc
@@ -7,6 +7,7 @@
 #include <windows.h>  // NOLINT
 #include <shlwapi.h>  // NOLINT
 #include <stddef.h>
+#include <stdint.h>
 #include <userenv.h>  // NOLINT
 
 #include <memory>
@@ -24,6 +25,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/windows_version.h"
@@ -48,7 +50,7 @@
 
 namespace {
 // The entry point signature of chrome.dll.
-typedef int (*DLL_MAIN)(HINSTANCE, sandbox::SandboxInterfaceInfo*);
+typedef int (*DLL_MAIN)(HINSTANCE, sandbox::SandboxInterfaceInfo*, int64_t);

[fdoray, 2016/09/19 17:03:28]

base::TimeTicks?

[grt (UTC plus 2), 2016/09/19 19:52:46]

See comment in chrome_main.cc.

 
 typedef void (*RelaunchChromeBrowserWithNewCommandLineIfNeededFunc)();
 
@@ -115,7 +117,8 @@ HMODULE MainDllLoader::Load(base::FilePath* module) {
 
 // Launching is a matter of loading the right dll and calling the entry point.
 // Derived classes can add custom code in the OnBeforeLaunch callback.
-int MainDllLoader::Launch(HINSTANCE instance) {
+int MainDllLoader::Launch(HINSTANCE instance,
+                          const base::TimeTicks& exe_entry_point_ticks) {
   const base::CommandLine& cmd_line = *base::CommandLine::ForCurrentProcess();
   process_type_ = cmd_line.GetSwitchValueASCII(switches::kProcessType);
 
@@ -165,7 +168,8 @@ int MainDllLoader::Launch(HINSTANCE instance) {
   OnBeforeLaunch(process_type_, file);
   DLL_MAIN chrome_main =
       reinterpret_cast<DLL_MAIN>(::GetProcAddress(dll_, "ChromeMain"));
-  int rc = chrome_main(instance, &sandbox_info);
+  int rc = chrome_main(instance, &sandbox_info,
+                       exe_entry_point_ticks.ToInternalValue());
   rc = OnBeforeExit(rc, file);
   return rc;
 }