Change native messaging paths on OSX to /Library/Google/Chrome/NativeMessagingHosts

chrome/browser/extensions/api/messaging/native_process_launcher_posix.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 "chrome/browser/extensions/api/messaging/native_process_launcher.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/process_util.h"
 #include "chrome/browser/extensions/api/messaging/native_messaging_host_manifest.h"
 
 namespace extensions {
 
 namespace {
 
 const char kNativeMessagingDirectory[] =
-#if defined(OS_MACOSX)
-    "/Library/Chrome/NativeMessagingHosts";
+#if defined(OFFICIAL_BUILD) && defined(OS_MACOSX)
+    "/Library/Google/Chrome/NativeMessagingHosts";
+#elif defined(OFFICIAL_BUILD) && !defined(OS_MACOSX)
+    "/etc/opt/chrome/native-messaging-hosts";
+#elif !defined(OFFICIAL_BUILD) && defined(OS_MACOSX)
+    "/Library/Application Support/Chromium/NativeMessagingHosts";
 #else
-    "/etc/opt/chrome/native-messaging-hosts";
+    "/etc/chromium/native-messaging-hosts";
 #endif
 
 }  // namespace
 
 // static
 scoped_ptr<NativeMessagingHostManifest>
 NativeProcessLauncher::FindAndLoadManifest(
     const std::string& native_host_name,
     std::string* error_message) {
   base::FilePath manifest_path =
@@ skipping 39 matching lines @@
   write_pipe_read_fd.reset();
   read_pipe_write_fd.reset();
 
   *read_file = *read_pipe_read_fd.release();
   *write_file = *write_pipe_write_fd.release();
 
   return true;
 }
 
 }  // namespace extensions