diff --git a/codereview.settings b/codereview.settings
index fd53dbc562..5ed52aa388 100644
--- a/codereview.settings
+++ b/codereview.settings
@@ -1,6 +1,6 @@
# This file is used by git cl to get repository specific information.
CC_LIST: chromium-reviews@chromium.org
-CODE_REVIEW_SERVER: codereview.chromium.org
+CODE_REVIEW_SERVER: chromium-review.googlesource.com
GERRIT_HOST: True
PROJECT: depot_tools
VIEW_VC: https://chromium.googlesource.com/chromium/tools/depot_tools/+/
diff --git a/man/html/depot_tools_tutorial.html b/man/html/depot_tools_tutorial.html
index fab2080a80..3a2a60c269 100644
--- a/man/html/depot_tools_tutorial.html
+++ b/man/html/depot_tools_tutorial.html
@@ -1061,7 +1061,7 @@ for review, run:
This will take the diff of your branch against its upstream branch (in that
case origin/master), and will post it to the
-Chromium code review site.
+Chromium code review site.
diff --git a/man/man7/depot_tools_tutorial.7 b/man/man7/depot_tools_tutorial.7
index 8f38adff7e..242a8de1e8 100644
--- a/man/man7/depot_tools_tutorial.7
+++ b/man/man7/depot_tools_tutorial.7
@@ -1047,7 +1047,7 @@ Pro Git book
.IP " 5." 4
Chromium code review site
.RS 4
-\%https://codereview.chromium.org
+\%https://chromium-review.googlesource.com
.RE
.IP " 6." 4
main Chromium waterfall
diff --git a/man/src/depot_tools_tutorial.txt b/man/src/depot_tools_tutorial.txt
index b2a82aa3aa..2cbfcb9a04 100644
--- a/man/src/depot_tools_tutorial.txt
+++ b/man/src/depot_tools_tutorial.txt
@@ -234,7 +234,7 @@ for review, run:
This will take the diff of your branch against its upstream branch (in that
case origin/master), and will post it to the
-link:https://codereview.chromium.org[Chromium code review site].
+link:https://chromium-review.googlesource.com[Chromium code review site].
UPDATING THE CODE
diff --git a/tests/gclient_utils_test.py b/tests/gclient_utils_test.py
index b6e88589c1..c7c6d8498a 100755
--- a/tests/gclient_utils_test.py
+++ b/tests/gclient_utils_test.py
@@ -318,6 +318,14 @@ class GClientUtilsTest(trial_dir.TestCase):
['ssh-svn://foo/bar/', 'ssh-svn://foo/bar/'],
['codereview.chromium.org', 'https://codereview.chromium.org'],
['codereview.chromium.org/', 'https://codereview.chromium.org/'],
+ [
+ 'chromium-review.googlesource.com',
+ 'https://chromium-review.googlesource.com'
+ ],
+ [
+ 'chromium-review.googlesource.com/',
+ 'https://chromium-review.googlesource.com/'
+ ],
['http://foo:10000', 'http://foo:10000'],
['http://foo:10000/bar', 'http://foo:10000/bar'],
['foo:10000', 'http://foo:10000'],
diff --git a/watchlists.py b/watchlists.py
index ee26f1029e..4ff270f49b 100755
--- a/watchlists.py
+++ b/watchlists.py
@@ -8,9 +8,10 @@
Watchlists is a mechanism that allow a developer (a "watcher") to watch over
portions of code that they are interested in. A "watcher" will be cc-ed to
changes that modify that portion of code, thereby giving them an opportunity
-to make comments on codereview.chromium.org even before the change is
+to make comments on chromium-review.googlesource.com even before the change is
committed.
-Refer: http://dev.chromium.org/developers/contributing-code/watchlists
+Refer:
+https://chromium.googlesource.com/chromium/src/+/HEAD/docs/infra/watchlists.md
When invoked directly from the base of a repository, this script lists out
the watchers for files given on the command line. This is useful to verify