Remove all traces of deprecated Get/SetReleaseTrack calls.

chromeos/dbus/update_engine_client.cc

 // Copyright (c) 2012 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 "chromeos/dbus/update_engine_client.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/strings/string_util.h"
 #include "dbus/bus.h"
@@ skipping 114 matching lines @@
         update_engine::kRebootIfNeeded);
 
     VLOG(1) << "Requesting a reboot";
     update_engine_proxy_->CallMethod(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&UpdateEngineClientImpl::OnRebootAfterUpdate,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
-  virtual void SetReleaseTrack(const std::string& track) OVERRIDE {
-    dbus::MethodCall method_call(
-        update_engine::kUpdateEngineInterface,
-        update_engine::kSetTrack);
-    dbus::MessageWriter writer(&method_call);
-    writer.AppendString(track);
-
-    VLOG(1) << "Requesting to set the release track to " << track;
-    update_engine_proxy_->CallMethod(
-        &method_call,
-        dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-        base::Bind(&UpdateEngineClientImpl::OnSetReleaseTrack,
-                   weak_ptr_factory_.GetWeakPtr()));
-  }
-
-  virtual void GetReleaseTrack(
-      const GetReleaseTrackCallback& callback) OVERRIDE {
-    dbus::MethodCall method_call(
-        update_engine::kUpdateEngineInterface,
-        update_engine::kGetTrack);
-
-    VLOG(1) << "Requesting to get the current release track";
-    update_engine_proxy_->CallMethod(
-        &method_call,
-        dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-        base::Bind(&UpdateEngineClientImpl::OnGetReleaseTrack,
-                   weak_ptr_factory_.GetWeakPtr(),
-                   callback));
-  }
-
   virtual Status GetLastStatus() OVERRIDE {
     return last_status_;
   }
 
   virtual void SetChannel(const std::string& target_channel,
                           bool is_powerwash_allowed) OVERRIDE {
     if (!IsValidChannel(target_channel)) {
       LOG(ERROR) << "Invalid channel name: " << target_channel;
       return;
     }
@@ skipping 59 matching lines @@
   }
 
   // Called when a response for RebootAfterUpdate() is received.
   void OnRebootAfterUpdate(dbus::Response* response) {
     if (!response) {
       LOG(ERROR) << "Failed to request rebooting after update";
       return;
     }
   }
 
-  // Called when a response for SetReleaseTrack() is received.
-  void OnSetReleaseTrack(dbus::Response* response) {
-    if (!response) {
-      LOG(ERROR) << "Failed to request setting release track";
-      return;
-    }
-  }
-
-  // Called when a response for GetReleaseTrack() is received.
-  void OnGetReleaseTrack(const GetReleaseTrackCallback& callback,
-                         dbus::Response* response) {
-    if (!response) {
-      LOG(ERROR) << "Failed to request getting release track";
-      callback.Run("");
-      return;
-    }
-    dbus::MessageReader reader(response);
-    std::string release_track;
-    if (!reader.PopString(&release_track)) {
-      LOG(ERROR) << "Incorrect response: " << response->ToString();
-      callback.Run("");
-      return;
-    }
-    VLOG(1) << "The current release track received: " << release_track;
-    callback.Run(release_track);
-  }
-
   // Called when a response for GetStatus is received.
   void OnGetStatus(dbus::Response* response) {
     if (!response) {
       LOG(ERROR) << "Failed to get response for GetStatus request.";
       return;
     }
 
     dbus::MessageReader reader(response);
     std::string current_operation;
     Status status;
     if (!(reader.PopInt64(&status.last_checked_time) &&
           reader.PopDouble(&status.download_progress) &&
           reader.PopString(&current_operation) &&
           reader.PopString(&status.new_version) &&
           reader.PopInt64(&status.new_size))) {
       LOG(ERROR) << "GetStatus had incorrect response: "
                  << response->ToString();
       return;
     }
     status.status = UpdateStatusFromString(current_operation);
     last_status_ = status;
     FOR_EACH_OBSERVER(Observer, observers_, UpdateStatusChanged(status));
   }
 
   // Called when GetStatus call failed.
   void OnGetStatusError(dbus::ErrorResponse* error) {
     LOG(ERROR) << "GetStatus request failed with error: " << error->ToString();
   }
 
-    // Called when a response for SetReleaseTrack() is received.
+  // Called when a response for SetReleaseChannel() is received.
   void OnSetChannel(dbus::Response* response) {
     if (!response) {
       LOG(ERROR) << "Failed to request setting channel";
       return;
     }
     VLOG(1) << "Succeeded to set channel";
   }
 
   // Called when a response for GetChannel() is received.
-  void OnGetChannel(const GetReleaseTrackCallback& callback,
+  void OnGetChannel(const GetChannelCallback& callback,
                     dbus::Response* response) {
     if (!response) {
       LOG(ERROR) << "Failed to request getting channel";
       callback.Run("");
       return;
     }
     dbus::MessageReader reader(response);
     std::string channel;
     if (!reader.PopString(&channel)) {
       LOG(ERROR) << "Incorrect response: " << response->ToString();
@@ skipping 58 matching lines @@
   // UpdateEngineClient implementation:
   virtual void AddObserver(Observer* observer) OVERRIDE {}
   virtual void RemoveObserver(Observer* observer) OVERRIDE {}
   virtual bool HasObserver(Observer* observer) OVERRIDE { return false; }
 
   virtual void RequestUpdateCheck(
       const UpdateCheckCallback& callback) OVERRIDE {
     callback.Run(UPDATE_RESULT_NOTIMPLEMENTED);
   }
   virtual void RebootAfterUpdate() OVERRIDE {}
-  virtual void SetReleaseTrack(const std::string& track) OVERRIDE {}
-  virtual void GetReleaseTrack(
-      const GetReleaseTrackCallback& callback) OVERRIDE {
-    callback.Run("beta-channel");
-  }
   virtual Status GetLastStatus() OVERRIDE { return Status(); }
   virtual void SetChannel(const std::string& target_channel,
                           bool is_powerwash_allowed) OVERRIDE {
     LOG(INFO) << "Requesting to set channel: "
               << "target_channel=" << target_channel << ", "
               << "is_powerwash_allowed=" << is_powerwash_allowed;
   }
   virtual void GetChannel(bool get_current_channel,
                           const GetChannelCallback& callback) OVERRIDE {
     LOG(INFO) << "Requesting to get channel, get_current_channel="
@@ skipping 18 matching lines @@
 UpdateEngineClient* UpdateEngineClient::Create(
     DBusClientImplementationType type,
     dbus::Bus* bus) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new UpdateEngineClientImpl(bus);
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new UpdateEngineClientStubImpl();
 }
 
 }  // namespace chromeos