diff options
| author | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-06 16:10:04 +0000 |
|---|---|---|
| committer | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-06 16:10:04 +0000 |
| commit | 23e63803fbf9a7aaf0a6107e36ea9c2ef6857d95 (patch) | |
| tree | c49353f10b6052ccf376d0a79453514664fbe794 /components/startup_metric_utils | |
| parent | 010a470359a8cea15e5f6cfbba2ef4a81e2713c2 (diff) | |
| download | chromium_src-23e63803fbf9a7aaf0a6107e36ea9c2ef6857d95.zip chromium_src-23e63803fbf9a7aaf0a6107e36ea9c2ef6857d95.tar.gz chromium_src-23e63803fbf9a7aaf0a6107e36ea9c2ef6857d95.tar.bz2 | |
Componentize bookmarks_codec_unittest
Moves test_bookmark_client to the bookmarks component and componentizes
bookmarks_codec_unittest. The latter entails moving data files to
//components/test/data and accessing them from that location in the test.
BUG=367839,367829
Review URL: https://codereview.chromium.org/269813006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268528 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/startup_metric_utils')
| -rw-r--r-- | components/startup_metric_utils/startup_metric_utils.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/components/startup_metric_utils/startup_metric_utils.cc b/components/startup_metric_utils/startup_metric_utils.cc index beb41cd..5f60e95 100644 --- a/components/startup_metric_utils/startup_metric_utils.cc +++ b/components/startup_metric_utils/startup_metric_utils.cc @@ -149,7 +149,8 @@ void OnBrowserStartupComplete(bool is_first_run) { // CurrentProcessInfo::CreationTime() is currently only implemented on some // platforms. -#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) +#if (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_WIN) || \ + defined(OS_LINUX) // Record timings between process creation, the main() in the executable being // reached and the main() in the shared library being reached. scoped_ptr<base::Environment> env(base::Environment::Create()); |