Merge Chromium at r65505: Initial merge by git.

Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45

1 files changed, 16 insertions, 0 deletions

diff --git a/chrome/browser/chromeos/cros/update_library.cc b/chrome/browser/chromeos/cros/update_library.cc
index 728cd4b..a201e0c 100644
--- a/chrome/browser/chromeos/cros/update_library.cc
+++ b/chrome/browser/chromeos/cros/update_library.cc
@@ -50,6 +50,20 @@ class UpdateLibraryImpl : public UpdateLibrary {
     return RebootIfUpdated();
   }
 
+  bool SetReleaseTrack(const std::string& track) {
+    if (!CrosLibrary::Get()->EnsureLoaded())
+      return false;
+
+    return chromeos::SetTrack(track);
+  }
+
+  std::string GetReleaseTrack() {
+    if (!CrosLibrary::Get()->EnsureLoaded())
+      return "";
+
+    return chromeos::GetTrack();
+  }
+
   const UpdateLibrary::Status& status() const {
     return status_;
   }
@@ -107,6 +121,8 @@ class UpdateLibraryStubImpl : public UpdateLibrary {
   void RemoveObserver(Observer* observer) {}
   bool CheckForUpdate() { return false; }
   bool RebootAfterUpdate() { return false; }
+  bool SetReleaseTrack(const std::string& track) { return false; }
+  std::string GetReleaseTrack() { return "beta-channel"; }
   const UpdateLibrary::Status& status() const {
     return status_;
   }