Enable whole-program vtable opt when CFI is enabled.

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index f5d107d0dc14f4b865cdaa75c592f66ef5d1ef08..7120836c637e8683adddc516c84a9f7cc9ae7a6e 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -6085,6 +6085,12 @@
             'arflags': [
               '--plugin', '../../<(make_clang_dir)/lib/LLVMgold.so',
             ],
+            'cflags': [
+              '-fwhole-program-vtables',
+            ],
+            'ldflags': [
+              '-fwhole-program-vtables',
+            ],
           }],
         ],
         'msvs_settings': {
@@ -6274,21 +6280,6 @@
         ],
       },
     }],
-    # TODO(pcc): Make these flags work correctly with CFI.
-    ['use_lto!=0 and cfi_vptr==0', {
-      'target_defaults': {
-        'target_conditions': [
-          ['_toolset=="target"', {
-            'cflags': [
-              '-fwhole-program-vtables',
-            ],
-            'ldflags': [
-              '-fwhole-program-vtables',
-            ],
-          }],
-        ],
-      },
-    }],
   ],
   'xcode_settings': {
     # DON'T ADD ANYTHING NEW TO THIS BLOCK UNLESS YOU REALLY REALLY NEED IT!