Move components/startup_metric_utils/* to components/startup_metric_utils/browser/*.

chrome/app/chrome_main_delegate.cc

Index: chrome/app/chrome_main_delegate.cc
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index b6c7bac122185d0b94c9d53b9d8d86c0fd028c67..caf37fc724999c112950d7ea4bf346cf9ae5b7d6 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -40,7 +40,6 @@
 #include "chrome/utility/chrome_content_utility_client.h"
 #include "components/component_updater/component_updater_paths.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
-#include "components/startup_metric_utils/startup_metric_utils.h"
 #include "components/version_info/version_info.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_paths.h"
@@ -126,6 +125,10 @@
 #include "pdf/pdf.h"
 #endif
 
+#if !defined(CHROME_MULTIPLE_DLL_CHILD)
+#include "components/startup_metric_utils/browser/startup_metric_utils.h"
+#endif
+
 #if !defined(CHROME_MULTIPLE_DLL_BROWSER)
 #include "chrome/child/pdf_child_init.h"
 
@@ -403,9 +406,8 @@ void InitLogging(const std::string& process_type) {
 }
 #endif
 
-}  // namespace
-
-ChromeMainDelegate::ChromeMainDelegate() {
+#if !defined(CHROME_MULTIPLE_DLL_CHILD)
+void RecordMainStartupMetrics() {
 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
   // Record the startup process creation time on supported platforms.
   startup_metric_utils::RecordStartupProcessCreationTime(
@@ -421,6 +423,16 @@ ChromeMainDelegate::ChromeMainDelegate() {
   startup_metric_utils::RecordMainEntryPointTime(base::Time::Now());
 #endif
 }
+#endif  // !defined(CHROME_MULTIPLE_DLL_CHILD)
+
+}  // namespace
+
+ChromeMainDelegate::ChromeMainDelegate() {
+#if !defined(CHROME_MULTIPLE_DLL_CHILD)
+  // Record startup metrics in the browser process only.
+  RecordMainStartupMetrics();

[gab, 2015/10/29 16:03:27]

I think this should only be recorded in the browser, i.e.
CHROME_MULTIPLE_DLL_BROWSER instead of !CHROME_MULTIPLE_DLL_CHILD

[fdoray, 2015/10/29 17:00:01]

Unfortunately, CHROME_MULTIPLE_DLL_BROWSER/_CHILD are not always defined (they
are not for component builds). I think that's why elsewhere in
chrome_main_delegate.cc, !defined(BROWSER/CHILD) is used instead of
defined(CHILD/BROWSER).

When I use defined(CHROME_MULTIPLE_DLL_BROWSER) with a component build,
RecordMainStartupMetrics() is not executed, but it is if I use
!defined(CHROME_MULTIPLE_DLL_CHILD). 

See
https://code.google.com/p/chromium/codesearch#search/&q=CHROME_MULTIPLE_DLL_%...

[gab, 2015/10/29 17:18:28]

I see. Then I guess this works (I don't like negative conditionals as they don't
scale to eventual new DLL splits but I doubt this will be a problem in practice
-- and there are other use cases with this issue in this file already).

Also, this means it will still be called in renderers in component builds which
is wrong (unless renderers eventually care about their main entry time, but then
MainEntryTime() should be in common/). We could confirm process_type.empty() but
that's a runtime check and won't help with removing the compile-time dependency.

Anyways, this is strictly better than before so lgtm.

+#endif  // !defined(CHROME_MULTIPLE_DLL_CHILD)
+}
 
 ChromeMainDelegate::~ChromeMainDelegate() {
 }