| Index: tools/clang/rewrite_to_chrome_style/tests/methods-expected.cc
|
| diff --git a/tools/clang/rewrite_to_chrome_style/tests/methods-expected.cc b/tools/clang/rewrite_to_chrome_style/tests/methods-expected.cc
|
| index 50b670007160eeb99362ee04747baa32186cebed..af33c2b94281f75c9b1a9786bc8b7a1ba6d5db93 100644
|
| --- a/tools/clang/rewrite_to_chrome_style/tests/methods-expected.cc
|
| +++ b/tools/clang/rewrite_to_chrome_style/tests/methods-expected.cc
|
| @@ -253,12 +253,6 @@ class Foo {
|
| void begin() {}
|
| static void Begin(int x) {}
|
|
|
| - // https://crbug.com/677166: We blacklist renaming of |hash|, because it
|
| - // collides with a struct named Hash. Blacklisting therefore should be broad
|
| - // and should cover both instance and static methods as well as functions.
|
| - int hash() const { return 123; }
|
| - static int hash(const Foo& x) { return x.hash(); }
|
| -
|
| // https://crbug.com672902: std-like names should not be rewritten.
|
| void emplace_back(int x) {}
|
| void insert(int x) {}
|
| @@ -270,9 +264,6 @@ class Foo {
|
| };
|
|
|
| void Begin(int x) {}
|
| -int hash(int x) {
|
| - return 123 * x;
|
| -}
|
| void swap(Foo& x, Foo& y) {}
|
|
|
| } // blacklisting_of_method_and_function_names
|
|
|