Reland "Remove old references to SampleApp"

This reverts commit 3ff2b200573354c83bbb52ff2f5f760eb481596e.

Reason for revert: Infra fires are out.

Original change's description:
> Revert "Remove old references to SampleApp"
> 
> This reverts commit 1c477fc263cf37c27cd92740d9328445420a926d.
> 
> Reason for revert: Botpocalypse.
> Original change's description:
> > Remove old references to SampleApp
> > 
> > Docs-Preview: https://skia.org/?cl=135570
> > Change-Id: I330ffa964c2d90ca8d3cd844aabcd8616ccd0540
> > Reviewed-on: https://skia-review.googlesource.com/135570
> > Reviewed-by: Cary Clark <caryclark@google.com>
> > Commit-Queue: Brian Osman <brianosman@google.com>
> 
> TBR=halcanary@google.com,brianosman@google.com,caryclark@google.com
> 
> Change-Id: I514e2c7bca8a1ebd311593573a94e8a078695785
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://skia-review.googlesource.com/135600
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Brian Osman <brianosman@google.com>

TBR=halcanary@google.com,brianosman@google.com,caryclark@google.com

Change-Id: I660482ef32acecf5b1bf24d2dec919bc68fde97e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/135660
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

4 files changed, 8 insertions, 9 deletions

diff --git a/site/dev/contrib/submit.md b/site/dev/contrib/submit.md
index 1d36e1f9d7..6627546b61 100644
--- a/site/dev/contrib/submit.md
+++ b/site/dev/contrib/submit.md
@@ -45,10 +45,9 @@ Test code is located under the 'tests' directory.
 See [Writing Unit and Rendering Tests](../testing/tests) for details.
 
 Unit tests are best, but if your change touches rendering and you can't think of
-an automated way to verify the results, consider writing a GM test or a new page
-of SampleApp. Also, if your change is the GPU code, you may not be able to write
-it as part of the standard unit test suite, but there are GPU-specific testing
-paths you can extend.
+an automated way to verify the results, consider writing a GM test. Also, if your
+change is in the GPU code, you may not be able to write it as part of the standard
+unit test suite, but there are GPU-specific testing paths you can extend.
 
 Submitting a patch
 ------------------
diff --git a/site/dev/testing/tests.md b/site/dev/testing/tests.md
index c24a1731e0..d9c0798b6c 100644
--- a/site/dev/testing/tests.md
+++ b/site/dev/testing/tests.md
@@ -78,12 +78,12 @@ Writing a Rendering Test
         ninja -C out/Debug dm
         out/Debug/dm --match newgmtest
 
-4.  Run the GM inside SampleApp:
+4.  Run the GM inside Viewer:
 
     <!--?prettify lang=sh?-->
 
-        ninja -C out/Debug SampleApp
-        out/Debug/SampleApp --slide GM:newgmtest
+        ninja -C out/Debug viewer
+        out/Debug/viewer --slide GM_newgmtest
 
 <span id="bench"></span>
 
diff --git a/site/user/api/skcanvas_creation.md b/site/user/api/skcanvas_creation.md
index 4055923904..de54dd9bbf 100644
--- a/site/user/api/skcanvas_creation.md
+++ b/site/user/api/skcanvas_creation.md
@@ -158,7 +158,7 @@ The SkPicture backend uses SkPictureRecorder instead of SkSurface.
         draw(recordingCanvas);
         sk_sp<SkPicture> picture = recorder.finishRecordingAsPicture();
         SkFILEWStream skpStream(path);
-        // Open SKP files with `SampleApp --picture SKP_FILE`
+        // Open SKP files with `viewer --skps PATH_TO_SKP --slide SKP_FILE`
         picture->serialize(&skpStream);
     }
 
diff --git a/site/user/special/lua.md b/site/user/special/lua.md
index b8a9cd5c9b..9798273ca9 100644
--- a/site/user/special/lua.md
+++ b/site/user/special/lua.md
@@ -21,7 +21,7 @@ Try It Out
 ----------
 
 The tools `lua_app` and `lua_pictures` should now be available when you compile,
-and `SampleApp` should now have a `Lua` sample.
+and `Viewer` should now have a `Lua` sample.
 
 
 To-Do