Revert r18641: "Linux: Enable metrics_service_uitest.cc."

chrome/browser/zygote_main_linux.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <unistd.h>
 #include <sys/epoll.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/signal.h>
 #include <sys/prctl.h>
@@ skipping 59 matching lines @@
     if (len == 0) {
       // EOF from the browser. We should die.
       _exit(0);
       return false;
     }
 
     Pickle pickle(buf, len);
     void* iter = NULL;
 
     int kind;
-    if (pickle.ReadInt(&iter, &kind)) {
-      switch (kind) {
-        case ZygoteHost::kCmdFork:
-          return HandleForkRequest(fd, pickle, iter, fds);
-        case ZygoteHost::kCmdReap:
-          if (!fds.empty())
-            break;
-          return HandleReapRequest(fd, pickle, iter);
-        case ZygoteHost::kCmdDidProcessCrash:
-          if (!fds.empty())
-            break;
-          return HandleDidProcessCrash(fd, pickle, iter);
-        default:
-          NOTREACHED();
-          break;
-      }
+    if (!pickle.ReadInt(&iter, &kind))
+      goto error;
+
+    if (kind == ZygoteHost::kCmdFork) {
+      return HandleForkRequest(fd, pickle, iter, fds);
+    } else if (kind == ZygoteHost::kCmdReap) {
+      if (fds.size())
+        goto error;
+      return HandleReapRequest(fd, pickle, iter);
     }
 
+   error:
     LOG(WARNING) << "Error parsing message from browser";
     for (std::vector<int>::const_iterator
          i = fds.begin(); i != fds.end(); ++i)
       close(*i);
     return false;
   }
 
   bool HandleReapRequest(int fd, Pickle& pickle, void* iter) {
     pid_t child;
 
     if (!pickle.ReadInt(&iter, &child)) {
       LOG(WARNING) << "Error parsing reap request from browser";
       return false;
     }
 
     ProcessWatcher::EnsureProcessTerminated(child);
 
     return false;
   }
 
-  bool HandleDidProcessCrash(int fd, Pickle& pickle, void* iter) {
-    base::ProcessHandle child;
-
-    if (!pickle.ReadInt(&iter, &child)) {
-      LOG(WARNING) << "Error parsing DidProcessCrash request from browser";
-      return false;
-    }
-
-    bool child_exited;
-    bool did_crash = base::DidProcessCrash(&child_exited, child);
-
-    Pickle write_pickle;
-    write_pickle.WriteBool(did_crash);
-    write_pickle.WriteBool(child_exited);
-    HANDLE_EINTR(write(fd, write_pickle.data(), write_pickle.size()));
-
-    return false;
-  }
-
   // Handle a 'fork' request from the browser: this means that the browser
   // wishes to start a new renderer.
   bool HandleForkRequest(int fd, Pickle& pickle, void* iter,
                          std::vector<int>& fds) {
     std::vector<std::string> args;
     int argc, numfds;
     base::GlobalDescriptors::Mapping mapping;
     pid_t child;
 
     if (!pickle.ReadInt(&iter, &argc))
@@ skipping 90 matching lines @@
 bool ZygoteMain(const MainFunctionParams& params) {
   if (!MaybeEnterChroot()) {
     LOG(FATAL) << "Failed to enter sandbox. Fail safe abort. (errno: "
                << errno << ")";
     return false;
   }
 
   Zygote zygote;
   return zygote.ProcessRequests();
 }