Make SkSHA1 and SkM5 use common SkDigestHash result type

gm/gm_expectations.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef gm_expectations_DEFINED
 #define gm_expectations_DEFINED
 
 #include <stdarg.h>
@@ skipping 76 matching lines @@
             fIgnoreFailure = ignoreFailure;
         }
 
         /**
          * Expect exactly one image (appropriate for the case when we
          * are comparing against a single PNG file).
          */
         Expectations(const SkBitmap& bitmap, bool ignoreFailure=kDefaultIgnoreFailure) {
             fBitmap = bitmap;
             fIgnoreFailure = ignoreFailure;
-            SkHashDigest digest;
+            SkUInt64HashDigest digest;
             // TODO(epoger): Better handling for error returned by ComputeDigest()?
             // For now, we just report a digest of 0 in error cases, like before.
             if (!SkBitmapHasher::ComputeDigest(bitmap, &digest)) {
                 digest = 0;
             }
             fAllowedChecksums.push_back() = digest;
         }
 
         /**
          * Create Expectations from a JSON element as found within the
@@ skipping 255 matching lines @@
             }
             return true;
         }
 
         Json::Value fJsonRoot;
         Json::Value fJsonExpectedResults;
     };
 
 }
 #endif