Support rewriting |to##macroArg()| into |To##macroArg()|.

tools/clang/rewrite_to_chrome_style/tests/macros-original.cc

Index: tools/clang/rewrite_to_chrome_style/tests/macros-original.cc
diff --git a/tools/clang/rewrite_to_chrome_style/tests/macros-original.cc b/tools/clang/rewrite_to_chrome_style/tests/macros-original.cc
index ab684841ea60ae4f36a8f4d39e26c174e004dc31..8a924eba63e7604b6eebcc00e46a1a6d5055dc82 100644
--- a/tools/clang/rewrite_to_chrome_style/tests/macros-original.cc
+++ b/tools/clang/rewrite_to_chrome_style/tests/macros-original.cc
@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Identifiers in macros should never be rewritten, as the risk of things
-// breaking is extremely high.
-
 #define DEFINE_TYPE_CASTS(thisType, argumentType, argumentName, predicate) \
   inline thisType* to##thisType(argumentType* argumentName) {              \
     if (!predicate)                                                        \
@@ -26,8 +23,6 @@ DEFINE_TYPE_CASTS(Derived, Base, object, true);
 
 void F() {
   Base* basePtr = new Derived;
-  // 'toDerived' should not be renamed, since the definition lives inside
-  // a macro invocation.
   Derived* derivedPtr = toDerived(basePtr);
   long long asInt = toInt(basePtr);
   // 'derivedPtr' should be renamed: it's a reference to a declaration defined
@@ -50,4 +45,47 @@ struct WithMacro : public WithMacroP {
   CALL_METHOD_FROM_MACRO();
 };
 
+#define DEFINE_WITH_TOKEN_CONCATENATION2(arg1, arg2) \
+  void arg1##arg2() {}
+// We definitely don't want to rewrite |arg1| on the previous line into
+// either |Arg1| or |Frg1| or |Brg1| or |Foo| or |Baz|.
+
+// We might or might not want to rewrite |foo|->|Foo| and |baz|->|Baz| below.
+// The test below just spells out the current behavior of the tool (which one
+// can argue is accidental).
+DEFINE_WITH_TOKEN_CONCATENATION2(foo, Bar1)
+DEFINE_WITH_TOKEN_CONCATENATION2(baz, Bar2)
+
+void tokenConcatenationTest2() {
+  // We might or might not want to rewrite |foo|->|Foo| and |baz|->|Baz| below.
+  // The test below just spells out the current behavior of the tool (which one
+  // can argue is accidental).
+  fooBar1();
+  bazBar2();
+}
+
+class FieldsMacro {
+ public:
+  // We shouldn't rewrite |m_fooBar| -> |foo_bar_|, because we cannot rewrite
+  // |m_##name| -> |???|.
+  FieldsMacro() : m_fooBar(123), m_barBaz(456) {}
+
+#define DECLARE_FIELD(name, Name) \
+ private:                         \
+  int m_##name;                   \
+                                  \
+ public:                          \
+  int name() { return m_##name; } \
+  void set##Name(int value) { m_##name = value; }
+
+  DECLARE_FIELD(fooBar, FooBar)
+  DECLARE_FIELD(barBaz, BarBaz)
+};
+
+int fieldsMacroTest() {
+  FieldsMacro fm;
+  fm.setFooBar(789);
+  return fm.fooBar() + fm.barBaz();
+}
+
 }  // namespace blink