BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

5 files changed, 31 insertions, 3 deletions

diff --git a/chromium/infra/config/dev/chromium-header.textpb b/chromium/infra/config/dev/chromium-header.textpb
index 1b9653f2d41..521cc65fdda 100644
--- a/chromium/infra/config/dev/chromium-header.textpb
+++ b/chromium/infra/config/dev/chromium-header.textpb
@@ -1,6 +1,6 @@
 oncalls {
   name: "Chromium"
-  url: "https://rota-ng-staging.appspot.com/legacy/sheriff.json"
+  url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
 }
 
 links: {
diff --git a/chromium/infra/config/dev/main.star b/chromium/infra/config/dev/main.star
index bd6d0edf4d6..266c362f3a2 100755
--- a/chromium/infra/config/dev/main.star
+++ b/chromium/infra/config/dev/main.star
@@ -1,9 +1,14 @@
 #!/usr/bin/env lucicfg
+# Copyright 2020 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.
+
 # See https://chromium.googlesource.com/infra/luci/luci-go/+/HEAD/lucicfg/doc/README.md
 # for information on starlark/lucicfg
 
 luci.project(
     name = 'chromium',
+    dev = True,
     buildbucket = 'cr-buildbucket-dev.appspot.com',
     logdog = 'luci-logdog-dev.appspot.com',
     milo = 'luci-milo-dev.appspot.com',
diff --git a/chromium/infra/config/dev/subprojects/chromium/ci.star b/chromium/infra/config/dev/subprojects/chromium/ci.star
index cc37e7abb22..fc3498648cd 100644
--- a/chromium/infra/config/dev/subprojects/chromium/ci.star
+++ b/chromium/infra/config/dev/subprojects/chromium/ci.star
@@ -1,3 +1,7 @@
+# Copyright 2020 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.
+
 load('//lib/builders.star', 'builder', 'cpu', 'defaults', 'os')
 
 luci.bucket(
@@ -79,7 +83,17 @@ ci_builder(
 
 ## builders using swarming staging instance
 
-ci_builder(
+def ci_builder_staging(**kwargs):
+  return ci_builder(
+      swarming_host = 'chromium-swarm-staging.appspot.com',
+      **kwargs
+  )
+
+ci_builder_staging(
     name = 'linux-rel-swarming-staging',
-    swarming_host = 'chromium-swarm-staging.appspot.com',
+)
+
+ci_builder_staging(
+    name = 'win-rel-swarming-staging',
+    os = os.WINDOWS_DEFAULT,
 )
diff --git a/chromium/infra/config/dev/subprojects/chromium/consoles/chromium.swarm.star b/chromium/infra/config/dev/subprojects/chromium/consoles/chromium.swarm.star
index e45d86fd637..91aa7ed9c31 100644
--- a/chromium/infra/config/dev/subprojects/chromium/consoles/chromium.swarm.star
+++ b/chromium/infra/config/dev/subprojects/chromium/consoles/chromium.swarm.star
@@ -1,3 +1,7 @@
+# Copyright 2020 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.
+
 luci.console_view(
     name = 'chromium.dev',
     header = '//dev/chromium-header.textpb',
@@ -17,5 +21,6 @@ luci.console_view(
     repo = 'https://chromium.googlesource.com/chromium/src',
     entries = [
         luci.console_view_entry(builder = 'ci/linux-rel-swarming-staging'),
+        luci.console_view_entry(builder = 'ci/win-rel-swarming-staging'),
    ],
 )
diff --git a/chromium/infra/config/dev/subprojects/chromium/main.star b/chromium/infra/config/dev/subprojects/chromium/main.star
index 9120462321e..ac749cedfc4 100644
--- a/chromium/infra/config/dev/subprojects/chromium/main.star
+++ b/chromium/infra/config/dev/subprojects/chromium/main.star
@@ -1,2 +1,6 @@
+# Copyright 2020 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.
+
 exec('./ci.star')
 exec('./consoles/chromium.swarm.star')