Move chromeos::version_loader to src/chromeos/system

In favor of less things to have in chrome/browser/chromeos.

BUG=437719
TEST=everything builds as before

Review URL: https://codereview.chromium.org/799683003

Cr-Commit-Position: refs/heads/master@{#308209}

chrome/browser/chromeos/chrome_browser_main_chromeos.h

@@ -9,7 +9,7 @@
 #include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/chrome_browser_main_linux.h"
 #include "chrome/browser/chromeos/external_metrics.h"
-#include "chrome/browser/chromeos/version_loader.h"
+#include "chromeos/system/version_loader.h"
 
 namespace base {
 class MemoryPressureObserverChromeOS;

chrome/browser/chromeos/login/version_info_updater.h

@@ -11,7 +11,7 @@
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
-#include "chrome/browser/chromeos/version_loader.h"
+#include "chromeos/system/version_loader.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
 
 namespace chromeos {

chrome/browser/chromeos/policy/device_status_collector.h

@@ -17,8 +17,8 @@
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
-#include "chrome/browser/chromeos/version_loader.h"
 #include "chrome/browser/idle.h"
+#include "chromeos/system/version_loader.h"
 #include "components/policy/core/common/cloud/cloud_policy_client.h"
 #include "content/public/browser/geolocation_provider.h"
 #include "content/public/common/geoposition.h"

chrome/browser/ui/webui/help/help_handler.h

@@ -17,7 +17,7 @@
 
 #if defined(OS_CHROMEOS)
 #include "base/task/cancelable_task_tracker.h"
-#include "chrome/browser/chromeos/version_loader.h"
+#include "chromeos/system/version_loader.h"
 #endif  // defined(OS_CHROMEOS)
 
 namespace base {

chrome/browser/ui/webui/version_handler_chromeos.h

@@ -8,8 +8,8 @@
 #include <string>
 
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/version_loader.h"
 #include "chrome/browser/ui/webui/version_handler.h"
+#include "chromeos/system/version_loader.h"
 
 // VersionHandlerChromeOS is responsible for loading the Chrome OS
 // version.

chrome/chrome_browser_chromeos.gypi

@@ -948,8 +948,6 @@
         'browser/chromeos/ui_proxy_config_service.h',
         'browser/chromeos/upgrade_detector_chromeos.cc',
         'browser/chromeos/upgrade_detector_chromeos.h',
-        'browser/chromeos/version_loader.cc',
-        'browser/chromeos/version_loader.h',
         'browser/supervised_user/chromeos/manager_password_service.cc',
         'browser/supervised_user/chromeos/manager_password_service.h',
         'browser/supervised_user/chromeos/manager_password_service_factory.cc',

chrome/chrome_tests_unit.gypi

@@ -249,7 +249,6 @@
       'browser/chromeos/timezone/timezone_unittest.cc',
       'browser/chromeos/ui/accessibility_focus_ring_controller_unittest.cc',
       'browser/chromeos/ui/idle_app_name_notification_view_unittest.cc',
-      'browser/chromeos/version_loader_unittest.cc',
       'browser/command_updater_unittest.cc',
       'browser/component_updater/test/cld_component_installer_unittest.cc',
       'browser/component_updater/test/component_installers_unittest.cc',

chromeos/chromeos.gyp

@@ -407,6 +407,8 @@
       'system/name_value_pairs_parser.h',
       'system/statistics_provider.cc',
       'system/statistics_provider.h',
+      'system/version_loader.cc',
+      'system/version_loader.h',
       'tpm/tpm_password_fetcher.cc',
       'tpm/tpm_password_fetcher.h',
       'tpm/tpm_token_info_getter.cc',
@@ -472,6 +474,7 @@
       'process_proxy/process_output_watcher_unittest.cc',
       'process_proxy/process_proxy_unittest.cc',
       'system/name_value_pairs_parser_unittest.cc',
+      'system/version_loader_unittest.cc',
       'tpm/tpm_token_info_getter_unittest.cc',
     ],
   },

chrome/browser/chromeos/version_loader.cc → chromeos/system/version_loader.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/version_loader.h"
+#include "chromeos/system/version_loader.h"
 
 #include <vector>
 

chrome/browser/chromeos/version_loader.h → chromeos/system/version_loader.h

@@ -2,11 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_VERSION_LOADER_H_
-#define CHROME_BROWSER_CHROMEOS_VERSION_LOADER_H_
+#ifndef CHROMEOS_SYSTEM_VERSION_LOADER_H_
+#define CHROMEOS_SYSTEM_VERSION_LOADER_H_
 
 #include <string>
 
+#include "chromeos/chromeos_export.h"
+
 namespace chromeos {
 namespace version_loader {
 
@@ -20,16 +22,16 @@ enum VersionFormat {
 // If |full_version| is true version string with extra info is extracted,
 // otherwise it's in short format x.x.xx.x.
 // Must be run on a blocking thread pool.
-std::string GetVersion(VersionFormat format);
+CHROMEOS_EXPORT std::string GetVersion(VersionFormat format);
 
 // Gets the firmware info.
 // Must be run on a blocking thread pool.
-std::string GetFirmware();
+CHROMEOS_EXPORT std::string GetFirmware();
 
 // Extracts the firmware from the file.
-std::string ParseFirmware(const std::string& contents);
+CHROMEOS_EXPORT std::string ParseFirmware(const std::string& contents);
 
 }  // namespace version_loader
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_VERSION_LOADER_H_
+#endif  // CHROMEOS_SYSTEM_VERSION_LOADER_H_

chrome/browser/chromeos/version_loader_unittest.cc → chromeos/system/version_loader_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/version_loader.h"
+#include "chromeos/system/version_loader.h"
 
 #include <string>