Media Galleries: Omit ById in various method names, since all operations are now by id.

device/media_transfer_protocol/media_transfer_protocol_daemon_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 "device/media_transfer_protocol/media_transfer_protocol_daemon_client.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 133 matching lines @@
     }
     proxy_->CallMethod(
         &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&MediaTransferProtocolDaemonClientImpl::OnGetFileInfo,
                    weak_ptr_factory_.GetWeakPtr(),
                    callback,
                    error_callback));
   }
 
   // MediaTransferProtocolDaemonClient override.
-  virtual void ReadFileChunkById(const std::string& handle,
-                                 uint32 file_id,
-                                 uint32 offset,
-                                 uint32 bytes_to_read,
-                                 const ReadFileCallback& callback,
-                                 const ErrorCallback& error_callback) OVERRIDE {
+  virtual void ReadFileChunk(const std::string& handle,
+                             uint32 file_id,
+                             uint32 offset,
+                             uint32 bytes_to_read,
+                             const ReadFileCallback& callback,
+                             const ErrorCallback& error_callback) OVERRIDE {
     DCHECK_LE(bytes_to_read, kMaxChunkSize);
-    dbus::MethodCall method_call(mtpd::kMtpdInterface,
-                                 mtpd::kReadFileChunkById);
+    dbus::MethodCall method_call(mtpd::kMtpdInterface, mtpd::kReadFileChunk);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(handle);
     writer.AppendUint32(file_id);
     writer.AppendUint32(offset);
     writer.AppendUint32(bytes_to_read);
     proxy_->CallMethod(
         &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&MediaTransferProtocolDaemonClientImpl::OnReadFile,
                    weak_ptr_factory_.GetWeakPtr(),
                    callback,
@@ skipping 151 matching lines @@
       LOG(ERROR) << kInvalidResponseMsg << response->ToString();
       error_callback.Run();
       return;
     }
 
     for (int i = 0; i < entries_protobuf.file_entries_size(); ++i)
       file_entries.push_back(entries_protobuf.file_entries(i));
     callback.Run(file_entries);
   }
 
-  // Handles the result of ReadFileChunkById and calls |callback| or
+  // Handles the result of ReadFileChunk and calls |callback| or
   // |error_callback|.
   void OnReadFile(const ReadFileCallback& callback,
                   const ErrorCallback& error_callback,
                   dbus::Response* response) {
     if (!response) {
       error_callback.Run();
       return;
     }
 
     const uint8* data_bytes = NULL;
@@ skipping 50 matching lines @@
 
 MediaTransferProtocolDaemonClient::~MediaTransferProtocolDaemonClient() {}
 
 // static
 MediaTransferProtocolDaemonClient* MediaTransferProtocolDaemonClient::Create(
     dbus::Bus* bus) {
   return new MediaTransferProtocolDaemonClientImpl(bus);
 }
 
 }  // namespace device