arc: fix wrong usage of ARC_GET_INSTANCE_FOR_METHOD

As described

TEST=None
BUG=None

Change-Id: I655413d632243de7a693fa0bdcaa4d53733aecc0
Reviewed-on: https://chromium-review.googlesource.com/1205474Reviewed-by: Luis Hector Chavez <lhchavez@chromium.org>
Reviewed-by: Yury Khmel <khmel@chromium.org>
Commit-Queue: Yury Khmel <khmel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#589047}

chrome/browser/chromeos/arc/fileapi/arc_file_system_operation_runner.cc

@@ -293,7 +293,7 @@ void ArcFileSystemOperationRunner::RemoveWatcher(
   watcher_callbacks_.erase(iter);
 
   auto* file_system_instance = ARC_GET_INSTANCE_FOR_METHOD(
-      arc_bridge_service_->file_system(), AddWatcher);
+      arc_bridge_service_->file_system(), RemoveWatcher);
   if (!file_system_instance) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::BindOnce(std::move(callback), false));

chrome/browser/ui/app_list/search/arc/arc_app_shortcuts_search_provider.cc

@@ -31,7 +31,7 @@ void ArcAppShortcutsSearchProvider::Start(const base::string16& query) {
       arc::ArcServiceManager::Get()
           ? ARC_GET_INSTANCE_FOR_METHOD(
                 arc::ArcServiceManager::Get()->arc_bridge_service()->app(),
-                GetAppShortcutItems)
+                GetAppShortcutGlobalQueryItems)
           : nullptr;
 
   if (!app_instance || query.empty()) {
@@ -43,11 +43,12 @@ void ArcAppShortcutsSearchProvider::Start(const base::string16& query) {
   weak_ptr_factory_.InvalidateWeakPtrs();
   app_instance->GetAppShortcutGlobalQueryItems(
       base::UTF16ToUTF8(query), max_results_,
-      base::BindOnce(&ArcAppShortcutsSearchProvider::OnGetAppShortcutItems,
-                     weak_ptr_factory_.GetWeakPtr()));
+      base::BindOnce(
+          &ArcAppShortcutsSearchProvider::OnGetAppShortcutGlobalQueryItems,
+          weak_ptr_factory_.GetWeakPtr()));
 }
 
-void ArcAppShortcutsSearchProvider::OnGetAppShortcutItems(
+void ArcAppShortcutsSearchProvider::OnGetAppShortcutGlobalQueryItems(
     std::vector<arc::mojom::AppShortcutItemPtr> shortcut_items) {
   SearchProvider::Results search_results;
   for (auto& item : shortcut_items) {

chrome/browser/ui/app_list/search/arc/arc_app_shortcuts_search_provider.h

@@ -29,7 +29,7 @@ class ArcAppShortcutsSearchProvider : public SearchProvider {
   void Start(const base::string16& query) override;
 
  private:
-  void OnGetAppShortcutItems(
+  void OnGetAppShortcutGlobalQueryItems(
       std::vector<arc::mojom::AppShortcutItemPtr> shortcut_items);
 
   const int max_results_;

components/arc/usb/usb_host_bridge.cc

@@ -211,7 +211,7 @@ void ArcUsbHostBridge::OnDeviceAdded(scoped_refptr<device::UsbDevice> device) {
 void ArcUsbHostBridge::OnDeviceRemoved(
     scoped_refptr<device::UsbDevice> device) {
   mojom::UsbHostInstance* usb_host_instance = ARC_GET_INSTANCE_FOR_METHOD(
-      arc_bridge_service_->usb_host(), OnDeviceAdded);
+      arc_bridge_service_->usb_host(), OnDeviceRemoved);
 
   if (!usb_host_instance) {
     VLOG(2) << "UsbInstance not ready yet";