arc: Partially migrate mojo types

chrome/browser/chromeos/arc/downloads_watcher/arc_downloads_watcher_service.cc

 // Copyright 2016 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 "chrome/browser/chromeos/arc/downloads_watcher/arc_downloads_watcher_service.h"
 
 #include <string.h>
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <memory>
-#include <string>
 #include <utility>
-#include <vector>
 
 #include "base/callback.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/files/file_path_watcher.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ skipping 153 matching lines @@
                                std::end(kAndroidSupportedMediaExtensions),
                                extension.c_str(), less_comparator);
   return iter != std::end(kAndroidSupportedMediaExtensions) &&
          strcmp(*iter, extension.c_str()) == 0;
 }
 
 // The core part of ArcDownloadsWatcherService to watch for file changes in
 // Downloads directory.
 class ArcDownloadsWatcherService::DownloadsWatcher {
  public:
-  using Callback = base::Callback<void(mojo::Array<mojo::String> paths)>;
+  using Callback = base::Callback<void(const std::vector<std::string>& paths)>;
 
   explicit DownloadsWatcher(const Callback& callback);
   ~DownloadsWatcher();
 
   // Starts watching Downloads directory.
   void Start();
 
  private:
   // Called by base::FilePathWatcher to notify file changes.
   // Kicks off the update of last_timestamp_map_ if one is not already in
@@ skipping 89 matching lines @@
     std::pair<base::TimeTicks, TimestampMap> timestamp_and_map) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   DCHECK(outstanding_task_);
   base::TimeTicks snapshot_time = timestamp_and_map.first;
   TimestampMap current_timestamp_map = std::move(timestamp_and_map.second);
   std::vector<base::FilePath> changed_paths =
       CollectChangedPaths(last_timestamp_map_, current_timestamp_map);
 
   last_timestamp_map_ = std::move(current_timestamp_map);
 
-  mojo::Array<mojo::String> mojo_paths(changed_paths.size());
+  std::vector<std::string> mojo_paths(changed_paths.size());

[Yusuke Sato, 2016/11/11 22:12:08]

nit: s/mojo_// or s/mojo_/string_/ ?

[Luis Héctor Chávez, 2016/11/11 22:19:21]

Chose the latter.

   for (size_t i = 0; i < changed_paths.size(); ++i) {
     mojo_paths[i] = changed_paths[i].value();
   }
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(callback_, base::Passed(std::move(mojo_paths))));
   if (last_notify_time_ > snapshot_time) {
     base::PostTaskAndReplyWithResult(
         BrowserThread::GetBlockingPool(), FROM_HERE,
         base::Bind(&BuildTimestampMapCallback, downloads_dir_),
@@ skipping 42 matching lines @@
 
 void ArcDownloadsWatcherService::StopWatchingDownloads() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (watcher_) {
     BrowserThread::DeleteSoon(BrowserThread::FILE, FROM_HERE,
                               watcher_.release());
   }
 }
 
 void ArcDownloadsWatcherService::OnDownloadsChanged(
-    mojo::Array<mojo::String> paths) {
+    const std::vector<std::string>& paths) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   auto* instance = arc_bridge_service()->file_system()->GetInstanceForMethod(
       "RequestMediaScan");
   if (!instance)
     return;
-  instance->RequestMediaScan(std::move(paths));
+  instance->RequestMediaScan(paths);
 }
 
 }  // namespace arc