Merge branch 'master' into lru-master

Author: Greg Soltis

.github/CODEOWNERS

@@ -2,7 +2,7 @@
 # Each line is a file pattern followed by one or more owners.
 
 # These owners will be the default owners for everything in the repo.
-*       @jshcrowthe @hiranya911 @mikelehen @bojeil-google @depoll
+*       @Feiyang1 @hiranya911 @mikelehen @bojeil-google @depoll
 
 # Database Code
 packages/database  @mikelehen @schmidt-sebastian

packages/functions/test/browser/callable.test.ts

@@ -21,6 +21,7 @@ import { HttpsError, FunctionsErrorCode } from '@firebase/functions-types';
 import firebase from '@firebase/app';
 import '@firebase/messaging';
 import { Service } from '../../src/api/service';
+import { isSupported } from '@firebase/messaging';
 
 export const TEST_PROJECT = require('../../../../config/project.json');
 
@@ -68,7 +69,7 @@ describe('Firebase Functions > Call', () => {
   // TODO(klimt): Move this to the cross-platform tests and delete this file,
   // once instance id works there.
   it('instance id', async () => {
-    if (!('serviceWorker' in navigator)) {
+    if (!isSupported()) {
       // Current platform does not support messaging, skip test.
       return;
     }