goma: use GOMA_SERVICE_ACCOUNT_JSON_FILE (reland #1)

scripts/slave/recipe_modules/chromium/api.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import re
 
 from recipe_engine import recipe_api
 from recipe_engine import util as recipe_util
 
 class TestLauncherFilterFileInputPlaceholder(recipe_util.InputPlaceholder):
@@ skipping 155 matching lines @@
       args += ['--build-args', self.c.compile_py.build_args]
     if self.c.compile_py.build_tool:
       args += ['--build-tool', self.c.compile_py.build_tool]
     if self.m.properties.get('build_data_dir'):
       args += ['--build-data-dir', self.m.properties.get('build_data_dir')]
     if self.c.compile_py.cross_tool:
       args += ['--crosstool', self.c.compile_py.cross_tool]
     if self.c.compile_py.compiler:
       args += ['--compiler', self.c.compile_py.compiler]
       if 'goma' in self.c.compile_py.compiler:
-        args += ['--goma-jsonstatus', self.m.json.output()]
+        args += [
+            '--goma-jsonstatus', self.m.json.output(),
+            '--goma-service-account-json-file',
+            self.m.goma.service_account_json_path,
+        ]
     if out_dir:
       args += ['--out-dir', out_dir]
     if self.c.compile_py.mode:
       args += ['--mode', self.c.compile_py.mode]
     if self.c.compile_py.goma_dir:
       args += ['--goma-dir', self.c.compile_py.goma_dir]
     if self.c.compile_py.goma_hermetic:
       args += ['--goma-hermetic', self.c.compile_py.goma_hermetic]
     if self.c.compile_py.goma_enable_remote_link:
       args += ['--goma-enable-remote-link']
@@ skipping 521 matching lines @@
       }))
 
   def get_annotate_by_test_name(self, test_name):
     return 'graphing'
 
   def download_lto_plugin(self):
     return self.m.python(
         name='download LTO plugin',
         script=self.m.path['checkout'].join(
             'build', 'download_gold_plugin.py'))