Revert of Slim Skia down to just one murmur3 implementation.

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 SkChecksum::FourByteAligned* d, size_t l) {
-    return SkChecksum::Murmur3(d, l);
-}
+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 SkChecksum::FourByteAligned*, size_t);
+    typedef uint32_t(*algorithmProc)(const uint32_t*, size_t);
     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();
     }
 
@@ skipping 12 matching lines @@
         for (size_t j = 0; j < SK_ARRAY_COUNT(tweaked); ++j) {
             const uint32_t saved = tweaked[j];
             tweaked[j] = rand.nextU();
             const uint32_t tweakedHash = algorithm(tweaked, kBytes);
             ASSERT(tweakedHash != hash);
             ASSERT(tweakedHash == algorithm(tweaked, kBytes));
             tweaked[j] = saved;
         }
     }
 }