Fixed file_version_info so that it finds Mac values correctly.

chrome/common/service_process_util.cc

 // Copyright (c) 2010 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 "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/singleton.h"
 #include "base/string16.h"
@@ skipping 66 matching lines @@
 
   scoped_ptr<installer::Version> service_version;
   service_version.reset(
       installer::Version::GetVersionFromString(ASCIIToUTF16(version)));
   // If the version string is invalid, treat it like an older version.
   if (!service_version.get())
     return SERVICE_OLDER_VERSION_RUNNING;
 
   // Get the version of the currently *running* instance of Chrome.
   chrome::VersionInfo version_info;
-  if (!version_info.is_valid()) {
-    NOTREACHED() << "Failed to get current file version";
-    // Our own version is invalid. This is an error case. Pretend that we
-    // are out of date.
-    return SERVICE_NEWER_VERSION_RUNNING;
-  }
   scoped_ptr<installer::Version> running_version(
       installer::Version::GetVersionFromString(
           ASCIIToUTF16(version_info.Version())));
   if (!running_version.get()) {
     NOTREACHED() << "Failed to parse version info";
     // Our own version is invalid. This is an error case. Pretend that we
     // are out of date.
     return SERVICE_NEWER_VERSION_RUNNING;
   }
 
@@ skipping 23 matching lines @@
   scoped_name.append(append_str);
   return scoped_name;
 }
 
 // Return a name that is scoped to this instance of the service process. We
 // use the user-data-dir and the version as a scoping prefix.
 std::string GetServiceProcessScopedVersionedName(
     const std::string& append_str) {
   std::string versioned_str;
   chrome::VersionInfo version_info;
-  DCHECK(version_info.is_valid());
   versioned_str.append(version_info.Version());
   versioned_str.append(append_str);
   return GetServiceProcessScopedName(versioned_str);
 }
 
 // Gets the name of the service process IPC channel.
 std::string GetServiceProcessChannelName() {
   return GetServiceProcessScopedVersionedName("_service_ipc");
 }
 
@@ skipping 47 matching lines @@
       ForceServiceProcessShutdown(running_version);
       break;
     case SERVICE_NOT_RUNNING:
       break;
   }
   return true;
 }
 
 bool ServiceProcessState::CreateSharedData() {
   chrome::VersionInfo version_info;
-  if (!version_info.is_valid()) {
-    NOTREACHED() << "Failed to get current file version";
-    return false;
-  }
   if (version_info.Version().length() >= kMaxVersionStringLength) {
     NOTREACHED() << "Version string length is << " <<
         version_info.Version().length() << "which is longer than" <<
         kMaxVersionStringLength;
     return false;
   }
 
   scoped_ptr<base::SharedMemory> shared_mem_service_data;
   shared_mem_service_data.reset(new base::SharedMemory());
   if (!shared_mem_service_data.get())
@@ skipping 16 matching lines @@
   shared_data->service_process_pid = base::GetCurrentProcId();
   shared_mem_service_data_.reset(shared_mem_service_data.release());
   return true;
 }
 
 
 std::string ServiceProcessState::GetAutoRunKey() {
   return GetServiceProcessScopedName("_service_run");
 }