Rename back _linuxish to linux.

content/app/android/sandboxed_process_service.cc

 // Copyright (c) 2012 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 "content/app/android/sandboxed_process_service.h"
 
 #include "base/global_descriptors_posix.h"
 #include "base/logging.h"
 #include "content/common/android/surface_texture_peer.h"
-#if !defined(ANDROID_UPSTREAM_BRINGUP)
-#include "content/common/chrome_descriptors.h"
-#endif
 #include "content/public/app/android_library_loader_hooks.h"
+#include "content/public/common/content_descriptors.h"
 #include "ipc/ipc_descriptors.h"
 #include "jni/sandboxed_process_service_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::CheckException;
 
 namespace {
 
 class SurfaceTexturePeerSandboxedImpl : public content::SurfaceTexturePeer {
  public:
@@ skipping 66 matching lines @@
   LOG(INFO) << "SandboxedProcessService: Exiting sandboxed process.";
   LibraryLoaderExitHook();
   _exit(0);
 }
 
 bool RegisterSandboxedProcessService(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content