Spin off incidental changes from DM CL (22839016).

gm/gm_expectations.cpp

Index: gm/gm_expectations.cpp
diff --git a/gm/gm_expectations.cpp b/gm/gm_expectations.cpp
index 63aa638aac58de2ff952666041e68601a40e76b8..828e9f8b97f84a7e9dc656aba7e4f1bb54ddd2f8 100644
--- a/gm/gm_expectations.cpp
+++ b/gm/gm_expectations.cpp
@@ -203,7 +203,7 @@ namespace skiagm {
 
     // IndividualImageExpectationsSource class...
 
-    Expectations IndividualImageExpectationsSource::get(const char *testName) {
+    Expectations IndividualImageExpectationsSource::get(const char *testName) const {
         SkString path = SkOSPath::SkPathJoin(fRootDir.c_str(), testName);
         SkBitmap referenceBitmap;
         bool decodedReferenceBitmap =
@@ -226,7 +226,7 @@ namespace skiagm {
         fJsonExpectedResults = fJsonRoot[kJsonKey_ExpectedResults];
     }
 
-    Expectations JsonExpectationsSource::get(const char *testName) {
+    Expectations JsonExpectationsSource::get(const char *testName) const {
         return Expectations(fJsonExpectedResults[testName]);
     }