| Index: components/arc/test/fake_intent_helper_instance.h
|
| diff --git a/components/arc/test/fake_intent_helper_instance.h b/components/arc/test/fake_intent_helper_instance.h
|
| index 3c1768c98e53283d8fd9e024f477e877ccf95ec8..a8ebf399fad3dc8b0188e9baaf16e2ab6c70cd19 100644
|
| --- a/components/arc/test/fake_intent_helper_instance.h
|
| +++ b/components/arc/test/fake_intent_helper_instance.h
|
| @@ -10,7 +10,6 @@
|
|
|
| #include "base/callback.h"
|
| #include "components/arc/common/intent_helper.mojom.h"
|
| -#include "mojo/public/cpp/bindings/binding.h"
|
|
|
| namespace arc {
|
|
|
| @@ -20,10 +19,10 @@ class FakeIntentHelperInstance : public mojom::IntentHelperInstance {
|
|
|
| class Broadcast {
|
| public:
|
| - Broadcast(const mojo::String& action,
|
| - const mojo::String& package_name,
|
| - const mojo::String& cls,
|
| - const mojo::String& extras);
|
| + Broadcast(const std::string& action,
|
| + const std::string& package_name,
|
| + const std::string& cls,
|
| + const std::string& extras);
|
|
|
| ~Broadcast();
|
|
|
| @@ -42,28 +41,28 @@ class FakeIntentHelperInstance : public mojom::IntentHelperInstance {
|
| // mojom::IntentHelperInstance:
|
| ~FakeIntentHelperInstance() override;
|
|
|
| - void AddPreferredPackage(const mojo::String& package_name) override;
|
| + void AddPreferredPackage(const std::string& package_name) override;
|
|
|
| - void GetFileSize(const mojo::String& url,
|
| + void GetFileSize(const std::string& url,
|
| const GetFileSizeCallback& callback) override;
|
|
|
| void HandleIntent(mojom::IntentInfoPtr intent,
|
| mojom::ActivityNamePtr activity) override;
|
|
|
| - void HandleUrl(const mojo::String& url,
|
| - const mojo::String& package_name) override;
|
| + void HandleUrl(const std::string& url,
|
| + const std::string& package_name) override;
|
|
|
| - void HandleUrlList(mojo::Array<mojom::UrlWithMimeTypePtr> urls,
|
| + void HandleUrlList(std::vector<mojom::UrlWithMimeTypePtr> urls,
|
| mojom::ActivityNamePtr activity,
|
| mojom::ActionType action) override;
|
|
|
| void Init(mojom::IntentHelperHostPtr host_ptr) override;
|
|
|
| - void OpenFileToRead(const mojo::String& url,
|
| + void OpenFileToRead(const std::string& url,
|
| const OpenFileToReadCallback& callback) override;
|
|
|
| void RequestActivityIcons(
|
| - mojo::Array<mojom::ActivityNamePtr> activities,
|
| + std::vector<mojom::ActivityNamePtr> activities,
|
| ::arc::mojom::ScaleFactor scale_factor,
|
| const RequestActivityIconsCallback& callback) override;
|
|
|
| @@ -72,17 +71,17 @@ class FakeIntentHelperInstance : public mojom::IntentHelperInstance {
|
| const RequestIntentHandlerListCallback& callback) override;
|
|
|
| void RequestUrlHandlerList(
|
| - const mojo::String& url,
|
| + const std::string& url,
|
| const RequestUrlHandlerListCallback& callback) override;
|
|
|
| void RequestUrlListHandlerList(
|
| - mojo::Array<mojom::UrlWithMimeTypePtr> urls,
|
| + std::vector<mojom::UrlWithMimeTypePtr> urls,
|
| const RequestUrlListHandlerListCallback& callback) override;
|
|
|
| - void SendBroadcast(const mojo::String& action,
|
| - const mojo::String& package_name,
|
| - const mojo::String& cls,
|
| - const mojo::String& extras) 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_;
|
| @@ -92,4 +91,4 @@ class FakeIntentHelperInstance : public mojom::IntentHelperInstance {
|
|
|
| } // namespace arc
|
|
|
| -#endif // COMPONENTS_ARC_TEST_FAKE_POLICY_INSTANCE_H_
|
| +#endif // COMPONENTS_ARC_TEST_FAKE_INTENT_HELPER_INSTANCE_H_
|
|
|