Merge 88595 - Revert 88545 - Revert 88470 (broke ServiceProcessStateTest.ForceShutdown on CrOS) -...

chrome/browser/chromeos/version_loader.h

Index: chrome/browser/chromeos/version_loader.h
===================================================================
--- chrome/browser/chromeos/version_loader.h	(revision 89114)
+++ chrome/browser/chromeos/version_loader.h	(working copy)
@@ -59,6 +59,12 @@
   Handle GetFirmware(CancelableRequestConsumerBase* consumer,
                      GetFirmwareCallback* callback);
 
+  // Parse the version information as a Chrome platfrom, not Chrome OS
+  // TODO(rkc): Change this and everywhere it is used once we switch Chrome OS
+  // over to xx.yyy.zz version numbers instead of 0.xx.yyy.zz
+  // Refer to http://code.google.com/p/chromium-os/issues/detail?id=15789
+  void EnablePlatformVersions(bool enable);
+
   static const char kFullVersionPrefix[];
   static const char kVersionPrefix[];
   static const char kFirmwarePrefix[];
@@ -72,7 +78,7 @@
   // and extract the version.
   class Backend : public base::RefCountedThreadSafe<Backend> {
    public:
-    Backend() {}
+    Backend() : parse_as_platform_(false) {}
 
     // Calls ParseVersion to get the version # and notifies request.
     // This is invoked on the file thread.
@@ -84,9 +90,13 @@
     // This is invoked on the file thread.
     void GetFirmware(scoped_refptr<GetFirmwareRequest> request);
 
+    void set_parse_as_platform(bool value) { parse_as_platform_ = value; }
+
    private:
     friend class base::RefCountedThreadSafe<Backend>;
 
+    bool parse_as_platform_;
+
     ~Backend() {}
 
     DISALLOW_COPY_AND_ASSIGN(Backend);