summaryrefslogtreecommitdiffstats
path: root/gin
diff options
context:
space:
mode:
authorjochen <jochen@chromium.org>2015-12-03 23:29:20 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-04 07:30:17 +0000
commit3c2d33560c6ab491e6c689474128656785b9bb8f (patch)
tree098525e27144a6316097cdc4ff66f93f489134e5 /gin
parentba02d22e594ec2a719c499c988a3e049353ef9cd (diff)
downloadchromium_src-3c2d33560c6ab491e6c689474128656785b9bb8f.zip
chromium_src-3c2d33560c6ab491e6c689474128656785b9bb8f.tar.gz
chromium_src-3c2d33560c6ab491e6c689474128656785b9bb8f.tar.bz2
Revert of Move ENABLE_PROFILING to build flags system. (patchset #3 id:40001 of https://codereview.chromium.org/1499773002/ )
Reason for revert: breaks Mac compile: debug/profiler.cc:9:10: fatal error: 'base/debug/debugging_flags.h' file not found #include "base/debug/debugging_flags.h" Original issue's description: > Move ENABLE_PROFILING to build flags system. > > This flag is only used in 3 files so having a global define is unnecessary. > > Moves the build flag to compiler.gni so it can be included by the new target in base that generates the header, as well as the tcmalloc target. > > The tcmalloc target now conditionally compiles the profiler depending on this flag. This is something the GYP build does but was inconsistent in GN. This results in the tcmalloc source files not being compiled in normal builds. > > This should remove the static initializer in tcmalloc profiling in the normal build. > > Independently, remove an iostream use in gin logging. Use printf instead. > > BUG=559766 > NOPRESUBMIT=true > (on account of changing the printf, which I did not add) > > Committed: https://crrev.com/41619210895837ee1a0063b786fed2b587ccc362 > Cr-Commit-Position: refs/heads/master@{#363156} TBR=dpranke@chromium.org,brettw@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=559766 Review URL: https://codereview.chromium.org/1497953002 Cr-Commit-Position: refs/heads/master@{#363161}
Diffstat (limited to 'gin')
-rw-r--r--gin/modules/console.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/gin/modules/console.cc b/gin/modules/console.cc
index 63fc41e..231d8fc 100644
--- a/gin/modules/console.cc
+++ b/gin/modules/console.cc
@@ -4,7 +4,7 @@
#include "gin/modules/console.h"
-#include <stdio.h>
+#include <iostream>
#include "base/strings/string_util.h"
#include "gin/arguments.h"
@@ -25,7 +25,7 @@ void Log(Arguments* args) {
args->ThrowError();
return;
}
- printf("%s\n", base::JoinString(messages, " ").c_str());
+ std::cout << base::JoinString(messages, " ") << std::endl;
}
WrapperInfo g_wrapper_info = { kEmbedderNativeGin };