Sync with various Google-internal changes.

Should not mean much for the open-source version.

snappy-test.h

@@ -132,7 +132,7 @@ namespace File {
 }  // namespace File
 
 namespace file {
-  int Defaults() { }
+  int Defaults() { return 0; }
 
   class DummyStatus {
    public:
@@ -158,6 +158,8 @@ namespace file {
     }
 
     fclose(fp);
+
+    return DummyStatus();
   }
 
   DummyStatus SetContents(const string& filename,
@@ -176,6 +178,8 @@ namespace file {
     }
 
     fclose(fp);
+
+    return DummyStatus();
   }
 }  // namespace file
 
@@ -572,6 +576,7 @@ class LogMessageVoidify {
 #define CHECK_NE(a, b) CRASH_UNLESS((a) != (b))
 #define CHECK_LT(a, b) CRASH_UNLESS((a) < (b))
 #define CHECK_GT(a, b) CRASH_UNLESS((a) > (b))
+#define CHECK_OK(cond) (cond).CheckSuccess()
 
 }  // namespace