Update protobuf to r428, part 1.

third_party/protobuf/src/google/protobuf/testing/googletest.cc

Index: third_party/protobuf/src/google/protobuf/testing/googletest.cc
===================================================================
--- third_party/protobuf/src/google/protobuf/testing/googletest.cc	(revision 216642)
+++ third_party/protobuf/src/google/protobuf/testing/googletest.cc	(working copy)
@@ -223,16 +223,17 @@
   active_log_ = NULL;
 }
 
-const vector<string>& ScopedMemoryLog::GetMessages(LogLevel dummy) const {
-  GOOGLE_CHECK_EQ(dummy, ERROR);
-  return messages_;
+const vector<string>& ScopedMemoryLog::GetMessages(LogLevel level) {
+  GOOGLE_CHECK(level == ERROR ||
+               level == WARNING);
+  return messages_[level];
 }
 
 void ScopedMemoryLog::HandleLog(LogLevel level, const char* filename,
                                 int line, const string& message) {
   GOOGLE_CHECK(active_log_ != NULL);
-  if (level == ERROR) {
-    active_log_->messages_.push_back(message);
+  if (level == ERROR || level == WARNING) {
+    active_log_->messages_[level].push_back(message);
   }
 }