Revert of Switch uses of SkChecksum::Compute to Murmur3.

tests/ChecksumTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkChecksum.h"
 #include "SkRandom.h"
 #include "Test.h"
 
 
 // Murmur3 has an optional third seed argument, so we wrap it to fit a uniform type.
 static uint32_t murmur_noseed(const uint32_t* d, size_t l) { return SkChecksum::Murmur3(d, l); }
 
 #define ASSERT(x) REPORTER_ASSERT(r, x)
 
 DEF_TEST(Checksum, r) {
     // Algorithms to test.  They're currently all uint32_t(const uint32_t*, size_t).
     typedef uint32_t(*algorithmProc)(const uint32_t*, size_t);
-    const algorithmProc kAlgorithms[] = { &murmur_noseed };
+    const algorithmProc kAlgorithms[] = { &SkChecksum::Compute, &murmur_noseed };
 
     // Put 128 random bytes into two identical buffers.  Any multiple of 4 will do.
     const size_t kBytes = SkAlign4(128);
     SkRandom rand;
     uint32_t data[kBytes/4], tweaked[kBytes/4];
     for (size_t i = 0; i < SK_ARRAY_COUNT(tweaked); ++i) {
         data[i] = tweaked[i] = rand.nextU();
     }
 
     // Test each algorithm.
@@ skipping 24 matching lines @@
     ASSERT(SkGoodHash()((uint32_t)4) ==  614249093);  // (Ditto)
 
     // None of these are 4 byte sized, so they use SkChecksum::Murmur3, not SkChecksum::Mix.
     ASSERT(SkGoodHash()((uint64_t)4) == 3491892518);
     ASSERT(SkGoodHash()((uint16_t)4) ==  899251846);
     ASSERT(SkGoodHash()( (uint8_t)4) ==  962700458);
 
     // Tests SkString is correctly specialized.
     ASSERT(SkGoodHash()(SkString("Hi")) == 55667557);
 }