arc: Implement more methods in FakeIntentHelperInstance.

components/arc/test/fake_intent_helper_instance.h

 // 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.
 
 #ifndef COMPONENTS_ARC_TEST_FAKE_INTENT_HELPER_INSTANCE_H_
 #define COMPONENTS_ARC_TEST_FAKE_INTENT_HELPER_INSTANCE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 16 matching lines @@
     ~Broadcast();
 
     Broadcast(const Broadcast& broadcast);
 
     std::string action;
     std::string package_name;
     std::string cls;
     std::string extras;
   };
 
+  // Parameters passed to HandleIntent(). Optional fields are saved as empty
+  // strings.
+  struct HandledIntent {

[Daniel Erat, 2016/12/16 02:29:03]

i tried hard to make this class have IntentInfoPtr and ActivityNamePtr members
instead of copying out the individual fields, but i don't understand how
std::move works in conjunction with mojo smart pointers. :-(

on the other hand, std::string members are probably easier for tests to work
with...

[hidehiko, 2016/12/16 04:27:12]

How about;

struct HandledIntent {
  HandledIntent(mojom::IntentInfoPtr intent, mojom::ActivityNamePtr activity);
  HandledIntent(HandledIntent&&) noexcept;
  ~HandledIntent();

  mojom::IntentInfoPtr intent;
  mojom::ActivityNamePtr activity;

  DISALLOW_COPY(HandledIntent);
};

HandledIntent::HandledIntent(mojom::IntentInfoPtr intent, mojom::ActivityNamePtr
activity)
  : intent(std::move(intent)), activity(std::move(activity)) {}

HandledIntent::HandledIntent(HandledIntent&& other) = default;
HandledIntent::~HandledIntent() = default;

In caller;

handled_intents_.emplace_back(std::move(intent), std::move(activity));

WDYT?

[Daniel Erat, 2016/12/16 05:41:04]

i tried something similar to this earlier, but i'm getting lengthy compilation
errors that i don't completely understand. if you'd like to take a look, i
copied the relevant code and errors to http://gpaste/6474333710974976 -- please
let me know if i'm missing something obvious. :-)

[hidehiko, 2016/12/16 06:30:20]

Wow, the copied error message is very easy to understand what's happening! Thank
you for sharing.

According to error message, it seems you were using const reference instead of
value (const mojom::IntentInfoPtr& v.s. mojom::IntentInfoPtr) for arguments.
In this case, you need value, so that the ownership can be transferred. Also, it
looks necessary to add move assignment operator, which is used in
emplace_back().

E.g.;

HandledIntent(mojom::IntentInfoPtr intent, ...)
  : intent(std::move(intent)) ...;

HandledIntent& operator=(HandledIntent&& other) = default;

(or if removing user defined move ctor works, it'd be simpler).

+    HandledIntent(const mojom::IntentInfoPtr& intent,
+                  const mojom::ActivityNamePtr& activity);
+    HandledIntent(const HandledIntent& other);
+    ~HandledIntent();
+
+    std::string action;
+    std::vector<std::string> categories;
+    std::string data;
+    std::string type;
+    std::string clip_data_uri;
+    std::string package;
+    std::string activity;
+  };
+
   void clear_broadcasts() { broadcasts_.clear(); }
+  void clear_handled_intents() { handled_intents_.clear(); }
 
   const std::vector<Broadcast>& broadcasts() const { return broadcasts_; }
+  const std::vector<HandledIntent>& handled_intents() const {
+    return handled_intents_;
+  }
+
+  // Sets a list of intent handlers to be returned in response to a
+  // RequestIntentHandlerList() call with an intent containing |action|. Note
+  // that the handlers will need to be set again after the
+  // RequestIntentHandlerList() call is made.

[Daniel Erat, 2016/12/16 02:29:03]

do you know of any way to duplicate the IntentHandlerInfo pointers so new
handlers don't need to passed in after each call to RequestIntentHandlerList()?

[hidehiko, 2016/12/16 04:27:12]

IntentHandlerInfoPtr::Clone() is what you need?
https://cs.chromium.org/chromium/src/mojo/public/cpp/bindings/struct_ptr.h?ty...

E.g. in caller:

RequestIntentHandlerList() {
  std::vector<IntentHandlerInfoPtr> handlers;
  auto it = intent_handlers_.find(intent->action);
  if (it != intent_handlers_.end()) {
    handlers.reserve(it->second.size());
    for (const auto& handler : it->second) {
      handlers.emplace_back(handler.Clone());
    }
  }
  ...->PostTask(
      FROM_HERE,
      base::Bind(callback, base::Passed(&handlers)));
}

or something?

[Daniel Erat, 2016/12/16 05:41:04]

thanks, i missed this when i was looking through the pointer class.

+  void SetIntentHandlers(
+      const std::string& action,
+      std::vector<mojom::IntentHandlerInfoPtr> handlers);
 
   // mojom::IntentHelperInstance:
   ~FakeIntentHelperInstance() override;
 
   void AddPreferredPackage(const std::string& package_name) override;
 
   void GetFileSizeDeprecated(
       const std::string& url,
       const GetFileSizeDeprecatedCallback& callback) override;
 
@@ skipping 31 matching lines @@
       const RequestUrlListHandlerListCallback& callback) override;
 
   void SendBroadcast(const std::string& action,
                      const std::string& package_name,
                      const std::string& cls,
                      const std::string& extras) override;
 
  private:
   std::vector<Broadcast> broadcasts_;
 
+  // Information about calls to HandleIntent().
+  std::vector<HandledIntent> handled_intents_;
+
+  // Map from action names to intent handlers to be returned by
+  // RequestIntentHandlerList().
+  std::map<std::string, std::vector<mojom::IntentHandlerInfoPtr>>

[hidehiko, 2016/12/16 04:27:12]

Could you add #include <map>?

[Daniel Erat, 2016/12/16 05:41:04]

whoops, done.

+      intent_handlers_;
+
   DISALLOW_COPY_AND_ASSIGN(FakeIntentHelperInstance);
 };
 
 }  // namespace arc
 
 #endif  // COMPONENTS_ARC_TEST_FAKE_INTENT_HELPER_INSTANCE_H_