Add OILPAN string to developer build chromium's webkit revision

content/common/user_agent.cc

Index: content/common/user_agent.cc
diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
index 1176c488d3d89ab814b0f79d1f1930b16449be17..380105365cecbc6ab34c73546a470753c5594671 100644
--- a/content/common/user_agent.cc
+++ b/content/common/user_agent.cc
@@ -37,7 +37,11 @@ std::string GetWebKitVersion() {
   return base::StringPrintf("%d.%d (%s)",
                             WEBKIT_VERSION_MAJOR,
                             WEBKIT_VERSION_MINOR,
-                            WEBKIT_SVN_REVISION);
+                            WEBKIT_SVN_REVISION
+#if defined(ENABLE_OILPAN) && ENABLE_OILPAN && !defined(OFFICIAL_BUILD)

[brettw, 2015/02/07 00:17:17]

You should do either "defined" style or check the value, but not both. Almost
all code does the defined style, and in fact there is no build code to set
ENABLE_OILPAN to 0. So just remove the ENABLE_OILPAN part of this.

Second, I don't understand the OFFICIAL_BUILD condition here. Shouldn't this
just key off of the value? You can key the ENABLE_OILPAN value off of whether
the build is official or not.

[tasak, 2015/02/10 05:51:24]

Because we don't need to add the "OILPAN" string to official build.

- Before shipping, we should not enable oilpan for official builds.
- After shipping, oilpan is always enabled. We don't need to check whether
oilpan build or not.

So I want to explicitly specify "!defined(OFFICIAL_BUILD)" here.
I also added FIXME comment here.

[brettw, 2015/02/10 22:51:38]

But shouldn'e the ENABLE_OILPAN flag always be set correctly? If you've got an
official build with the ENABLE_OILPAN flag set and you don't want oilpan
enabled, or vice versa, something is wrong.

+                            "-OILPAN"
+#endif
+    );
 }
 
 int GetWebKitMajorVersion() {
@@ -49,7 +53,11 @@ int GetWebKitMinorVersion() {
 }
 
 std::string GetWebKitRevision() {
-  return WEBKIT_SVN_REVISION;
+  return WEBKIT_SVN_REVISION
+#if defined(ENABLE_OILPAN) && ENABLE_OILPAN && !defined(OFFICIAL_BUILD)
+         "-OILPAN"
+#endif
+    ;
 }
 
 std::string BuildOSCpuInfo() {