[fix] refactor

Author: eternalsakura

CodeQL_Queries/cpp/Chrome/object_lifetime/lifetime_management.qll

@@ -2,13 +2,9 @@ import cpp
 import callbacks
 
 /**
- * Models various mechanism in Chrome that is used for managing object lifetime.
+ * A map field that has pointer as key and managed pointer of the same type as value.
+ * Usually the value are backing the keys, so it is usually ok.
  */
-
- /**
-  * A map field that has pointer as key and managed pointer of the same type as value. 
-  * Usually the value are backing the keys, so it is usually ok.
-  */
 class ManagedKeyValueField extends MapField {
   ManagedKeyValueField() {
     exists(PointerType key, ManagedPtr value |
@@ -40,13 +36,9 @@ predicate destructorCleanup(GeneralPointerField f, Destructor d, Expr fa) {
  * so raw pointer of rfh inside it is usually ok.
  */
 class FrameServiceBase extends ClassTemplateInstantiation {
-  FrameServiceBase() {
-    getName().matches("FrameServiceBase<%")
-  }
-  
-  Type getService() {
-    result = getTemplateArgument(0)
-  }
+  FrameServiceBase() { getName().matches("FrameServiceBase<%") }
+
+  Type getService() { result = getTemplateArgument(0) }
 }
 
 predicate frameServiceBaseProtected(Field f) {
@@ -60,13 +52,15 @@ predicate frameServiceBaseProtected(Field f) {
  * inside constructor/destructor etc., which usually makes them ok.
  */
 predicate notInsideConstructor(Class c, Expr e) {
-  not exists(Constructor f | f = e.getEnclosingFunction() and
+  not exists(Constructor f |
+    f = e.getEnclosingFunction() and
     f.getDeclaringType() = c
   )
 }
 
 predicate notInsideDestructor(Class c, Expr e) {
-  not exists(Destructor f | f = e.getEnclosingFunction() and
+  not exists(Destructor f |
+    f = e.getEnclosingFunction() and
     f.getDeclaringType() = c
   )
 }

CodeQL_Queries/cpp/Chrome/object_lifetime/obj_lifetime.qll

@@ -4,7 +4,6 @@ import pointers.managed_ptr
 /**
  * Long live classes, e.g. Singleton, classes owned by BrowserLoop etc.
  */
-
 class OwnedByBrowserContext extends Class {
   OwnedByBrowserContext() {
     this.getName() = "VideoDecodePerfHistory" or
@@ -18,21 +17,30 @@ class OwnedByBrowserContext extends Class {
     this.getName() = "DownloadManager" or
     this.getName() = "BrowsingDataRemover" or
     this.getName() = "PermissionController"
-  } 
+  }
 }
 
 class Singleton extends Type {
   Singleton() {
-    this.hasName("MediaInternals") or
-    hasName("NetworkConnectionTracker") or
-    hasName("ChildProcessSecurityPolicyImpl") or
-    hasName("MprisService") or
-    hasName("PluginServiceFilter") or
-    hasName("TickClock") or
-    exists(Class c | c.getName().matches("Singleton<%") and
+    this.hasName("MediaInternals")
+    or
+    hasName("NetworkConnectionTracker")
+    or
+    hasName("ChildProcessSecurityPolicyImpl")
+    or
+    hasName("MprisService")
+    or
+    hasName("PluginServiceFilter")
+    or
+    hasName("TickClock")
+    or
+    exists(Class c |
+      c.getName().matches("Singleton<%") and
       this = c.getTemplateArgument(0)
-    ) or
-    exists(Variable v | v.isStatic() and
+    )
+    or
+    exists(Variable v |
+      v.isStatic() and
       v.getType().getName().matches("NoDestructor<%") and
       v.getType().(Class).getTemplateArgument(0) = this and
       not this.getName().matches("vector<%") and
@@ -58,11 +66,15 @@ class Singleton extends Type {
  */
 class OwnedByBrowserMainLoop extends Class {
   OwnedByBrowserMainLoop() {
-    exists(GeneralManagedField f | f.getManagedType() = this and
+    exists(GeneralManagedField f |
+      f.getManagedType() = this and
       f.getDeclaringType().hasName("BrowserMainLoop")
-    ) or
-    getName() = "UserInputMonitor" or
-    getName() = "UserInputMonitorBase" or
+    )
+    or
+    getName() = "UserInputMonitor"
+    or
+    getName() = "UserInputMonitorBase"
+    or
     getName() = "BrowserGpuChannelHostFactory"
   }
 }