Only upload GPU pixel data to Chrome instance

Changes the GPU pixel tests to only upload data to the Chrome Gold
instance now that all the data has been migrated.

Bug: 1113308, skia:10723
Change-Id: I99271ec1ddc41989eb854e6ce0117fa18b723d33
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2424497
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Auto-Submit: Brian Sheedy <bsheedy@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809652}

content/test/gpu/gpu_tests/skia_gold/gpu_skia_gold_session_manager.py

@@ -13,7 +13,7 @@ from skia_gold_common import skia_gold_session_manager as sgsm
 class GpuSkiaGoldSessionManager(sgsm.SkiaGoldSessionManager):
   @staticmethod
   def _GetDefaultInstance():
-    return 'chrome-gpu'
+    return 'chrome'
 
   @staticmethod
   def _GetSessionClass():

content/test/gpu/gpu_tests/skia_gold_integration_test_base.py

@@ -29,8 +29,7 @@ TEST_DATA_DIRS = [
     os.path.join(path_util.GetChromiumSrcDir(), 'media/test/data'),
 ]
 
-SKIA_GOLD_INSTANCE = 'chrome-gpu'
-SKIA_GOLD_CORPUS = SKIA_GOLD_INSTANCE
+SKIA_GOLD_CORPUS = 'chrome-gpu'
 
 
 class _ImageParameters(object):
@@ -344,25 +343,13 @@ class SkiaGoldIntegrationTestBase(gpu_integration_test.GpuIntegrationTest):
 
     gpu_keys = self.GetGoldJsonKeys(page)
     gold_session = self.GetSkiaGoldSessionManager().GetSkiaGoldSession(
-        gpu_keys, corpus=SKIA_GOLD_CORPUS, instance='chrome')
+        gpu_keys, corpus=SKIA_GOLD_CORPUS)
     gold_properties = self.GetSkiaGoldProperties()
     use_luci = not (gold_properties.local_pixel_tests
                     or gold_properties.no_luci_auth)
 
     inexact_matching_args = page.matching_algorithm.GetCmdline()
 
-    # TODO(crbug.com/1113308): Switch the FYI session to the only session once
-    # all the data is migrated to the Chrome Gold instance.
-    status, error = gold_session.RunComparison(
-        name=image_name,
-        png_file=png_temp_file,
-        inexact_matching_args=inexact_matching_args,
-        use_luci=use_luci)
-    if status:
-      logging.warning('FYI Gold comparison failed with status %s and error %s',
-                      status, error)
-
-    gold_session = self.GetSkiaGoldSessionManager().GetSkiaGoldSession(gpu_keys)
     status, error = gold_session.RunComparison(
         name=image_name,
         png_file=png_temp_file,