file_version_info was not finding Mac values correctly.

Changed file_version_info to find Mac values, and changed version_info to fail if values can't be found.

BUG=NONE
TEST=BUILD

Review URL: http://codereview.chromium.org/5815001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69592 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 9 deletions

diff --git a/base/file_version_info_mac.h b/base/file_version_info_mac.h
index d66c4e6..36cb538 100644
--- a/base/file_version_info_mac.h
+++ b/base/file_version_info_mac.h
@@ -8,9 +8,8 @@
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/file_version_info.h"
-#include "base/scoped_ptr.h"
+#include "base/scoped_nsobject.h"
 
 #ifdef __OBJC__
 @class NSBundle;
@@ -25,7 +24,6 @@ class NSBundle;
 class FileVersionInfoMac : public FileVersionInfo {
  public:
   explicit FileVersionInfoMac(NSBundle *bundle);
-  ~FileVersionInfoMac();
 
   // Accessors to the different version properties.
   // Returns an empty string if the property is not found.
@@ -47,14 +45,13 @@ class FileVersionInfoMac : public FileVersionInfo {
   virtual bool is_official_build();
 
  private:
-  // Lets you access other properties not covered above.
-  bool GetValue(const wchar_t* name, std::wstring* value);
 
-  // Similar to GetValue but returns a wstring (empty string if the property
-  // does not exist).
-  std::wstring GetStringValue(const wchar_t* name);
 
-  NSBundle *bundle_;
+  // Returns a wstring value for a property name.
+  // Returns the empty string if the property does not exist.
+  std::wstring GetWStringValue(CFStringRef name);
+
+  scoped_nsobject<NSBundle> bundle_;
 
   DISALLOW_COPY_AND_ASSIGN(FileVersionInfoMac);
 };