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

chrome/browser/browser_about_handler.cc

 // Copyright (c) 2011 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/browser_about_handler.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 1235 matching lines @@
   source_->FinishDataRequest(template_html, request_id_);
 }
 
 #if defined(OS_CHROMEOS)
 // ChromeOSAboutVersionHandler  -----------------------------------------------
 
 ChromeOSAboutVersionHandler::ChromeOSAboutVersionHandler(AboutSource* source,
                                                          int request_id)
     : source_(source),
       request_id_(request_id) {
+  loader_.EnablePlatformVersions(true);
   loader_.GetVersion(&consumer_,
                      NewCallback(this, &ChromeOSAboutVersionHandler::OnVersion),
                      chromeos::VersionLoader::VERSION_FULL);
 }
 
 void ChromeOSAboutVersionHandler::OnVersion(
     chromeos::VersionLoader::Handle handle,
     std::string version) {
   DictionaryValue localized_strings;
   localized_strings.SetString("os_version", version);
@@ skipping 166 matching lines @@
   return false;
 }
 
 std::vector<std::string> AboutPaths() {
   std::vector<std::string> paths;
   paths.reserve(arraysize(kAllAboutPaths));
   for (size_t i = 0; i < arraysize(kAllAboutPaths); i++)
     paths.push_back(kAllAboutPaths[i]);
   return paths;
 }