[app_driver] Unify in a single directory.
Agent driver and module driver are flavors of app driver and
make most sense when read together with app driver. Hence move them
in the same directory app_driver. This also makes it less likely
that updates to app driver forget agent driver and module driver,
as happened in
https://fuchsia-review.googlesource.com/#/c/peridot/+/75055/.
Add a README that briefly describes the app driver framework
coherently.
Collateral cleanup:
* Always include public lib header files from lib rather than
peridot/public/lib.
Change-Id: I21946c3bda43a761e69927bded10dcf987a2a306
diff --git a/bin/module_resolver/BUILD.gn b/bin/module_resolver/BUILD.gn
index b9de245..aea071d 100644
--- a/bin/module_resolver/BUILD.gn
+++ b/bin/module_resolver/BUILD.gn
@@ -12,7 +12,7 @@
"//garnet/public/lib/app/cpp",
"//garnet/public/lib/fsl",
"//garnet/public/lib/fxl",
- "//peridot/public/lib/app_driver/cpp",
+ "//peridot/public/lib/app_driver/cpp:app_driver",
"//peridot/public/lib/module_resolver/fidl",
]
}
diff --git a/bin/module_resolver/module_resolver_main.cc b/bin/module_resolver/module_resolver_main.cc
index f3b7221..2a15f30 100644
--- a/bin/module_resolver/module_resolver_main.cc
+++ b/bin/module_resolver/module_resolver_main.cc
@@ -5,12 +5,12 @@
#include "lib/app/cpp/application_context.h"
#include "lib/app/cpp/connect.h"
+#include "lib/app_driver/cpp/app_driver.h"
#include "lib/fidl/cpp/bindings/binding.h"
#include "lib/fsl/tasks/message_loop.h"
#include "lib/fxl/logging.h"
#include "lib/fxl/macros.h"
#include "lib/module_resolver/fidl/module_resolver.fidl.h"
-#include "lib/app_driver/cpp/app_driver.h"
#include "peridot/bin/module_resolver/module_resolver_impl.h"
diff --git a/public/lib/agent_driver/cpp/BUILD.gn b/public/lib/agent_driver/cpp/BUILD.gn
deleted file mode 100644
index f034fd9..0000000
--- a/public/lib/agent_driver/cpp/BUILD.gn
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2017 The Fuchsia Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//garnet/public/lib/fidl/fidl.gni")
-
-group("cpp") {
- public_deps = [
- ":agent_driver",
- ]
-}
-
-source_set("agent_driver") {
- sources = [
- "agent_driver.h",
- ]
-
- public_deps = [
- "//garnet/public/lib/app/cpp",
- "//garnet/public/lib/fidl/cpp/bindings",
- "//garnet/public/lib/fsl",
- "//garnet/public/lib/fxl",
- "//peridot/public/lib/agent/cpp",
- "//peridot/public/lib/agent/fidl",
- "//peridot/public/lib/lifecycle/cpp",
- ]
-}
diff --git a/public/lib/app_driver/cpp/BUILD.gn b/public/lib/app_driver/cpp/BUILD.gn
index 07097fe..7a002b4 100644
--- a/public/lib/app_driver/cpp/BUILD.gn
+++ b/public/lib/app_driver/cpp/BUILD.gn
@@ -6,7 +6,25 @@
group("cpp") {
public_deps = [
+ ":agent_driver",
":app_driver",
+ ":module_driver",
+ ]
+}
+
+source_set("agent_driver") {
+ sources = [
+ "agent_driver.h",
+ ]
+
+ public_deps = [
+ "//garnet/public/lib/app/cpp",
+ "//garnet/public/lib/fidl/cpp/bindings",
+ "//garnet/public/lib/fsl",
+ "//garnet/public/lib/fxl",
+ "//peridot/public/lib/agent/cpp",
+ "//peridot/public/lib/agent/fidl",
+ "//peridot/public/lib/lifecycle/cpp",
]
}
@@ -26,3 +44,20 @@
"//peridot/public/lib/lifecycle/cpp",
]
}
+
+source_set("module_driver") {
+ sources = [
+ "module_driver.h",
+ ]
+
+ public_deps = [
+ "//garnet/public/lib/app/cpp",
+ "//garnet/public/lib/fidl/cpp/bindings",
+ "//garnet/public/lib/fsl",
+ "//garnet/public/lib/fxl",
+ "//garnet/public/lib/ui/views/fidl",
+ "//peridot/public/lib/lifecycle/cpp",
+ "//peridot/public/lib/module/cpp",
+ "//peridot/public/lib/module/fidl",
+ ]
+}
diff --git a/public/lib/app_driver/cpp/README.md b/public/lib/app_driver/cpp/README.md
new file mode 100644
index 0000000..dabaff6
--- /dev/null
+++ b/public/lib/app_driver/cpp/README.md
@@ -0,0 +1,13 @@
+# AppDriver
+
+App driver is a small framework that supports life cycle management of fidl
+components by implementing the Lifecycle FIDL service.
+
+There are three flavors of app driver: for generic components (AppDriver), for
+components that are run as Modules (ModuleDriver), and for components that are
+run as Agents (AgentDriver). Agents and Modules have additional facets at
+initialization in addition to the asynchronous teardown sequence that Lifecycle
+imposes. See the .h files for details.
+
+
+
diff --git a/public/lib/agent_driver/cpp/agent_driver.h b/public/lib/app_driver/cpp/agent_driver.h
similarity index 96%
rename from public/lib/agent_driver/cpp/agent_driver.h
rename to public/lib/app_driver/cpp/agent_driver.h
index 6d71c07..154cbbf 100644
--- a/public/lib/agent_driver/cpp/agent_driver.h
+++ b/public/lib/app_driver/cpp/agent_driver.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef LIB_AGENT_DRIVER_CPP_AGENT_DRIVER_H_
-#define LIB_AGENT_DRIVER_CPP_AGENT_DRIVER_H_
+#ifndef LIB_APP_DRIVER_CPP_AGENT_DRIVER_H_
+#define LIB_APP_DRIVER_CPP_AGENT_DRIVER_H_
#include <memory>
@@ -121,4 +121,4 @@
} // namespace modular
-#endif // LIB_AGENT_DRIVER_CPP_AGENT_DRIVER_H_
+#endif // LIB_APP_DRIVER_CPP_AGENT_DRIVER_H_
diff --git a/public/lib/module_driver/cpp/module_driver.h b/public/lib/app_driver/cpp/module_driver.h
similarity index 97%
rename from public/lib/module_driver/cpp/module_driver.h
rename to public/lib/app_driver/cpp/module_driver.h
index d2c9b40..f588846 100644
--- a/public/lib/module_driver/cpp/module_driver.h
+++ b/public/lib/app_driver/cpp/module_driver.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef LIB_MODULE_DRIVER_CPP_MODULE_DRIVER_H_
-#define LIB_MODULE_DRIVER_CPP_MODULE_DRIVER_H_
+#ifndef LIB_APP_DRIVER_CPP_MODULE_DRIVER_H_
+#define LIB_APP_DRIVER_CPP_MODULE_DRIVER_H_
#include <memory>
@@ -156,4 +156,4 @@
} // namespace modular
-#endif // LIB_MODULE_DRIVER_CPP_MODULE_DRIVER_H_
+#endif // LIB_APP_DRIVER_CPP_MODULE_DRIVER_H_
diff --git a/public/lib/module_driver/cpp/BUILD.gn b/public/lib/module_driver/cpp/BUILD.gn
deleted file mode 100644
index 64f74f7..0000000
--- a/public/lib/module_driver/cpp/BUILD.gn
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2017 The Fuchsia Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//garnet/public/lib/fidl/fidl.gni")
-
-group("cpp") {
- public_deps = [
- ":module_driver",
- ]
-}
-
-source_set("module_driver") {
- sources = [
- "module_driver.h",
- ]
-
- # Since this is a header-only target, all dependencies in module_driver.h
- # need to also be dependencies in consuming targets.
- public_deps = [
- "//garnet/public/lib/app/cpp",
- "//garnet/public/lib/fidl/cpp/bindings",
- "//garnet/public/lib/fsl",
- "//garnet/public/lib/fxl",
- "//garnet/public/lib/ui/views/fidl",
- "//peridot/public/lib/lifecycle/cpp",
- "//peridot/public/lib/module/cpp",
- "//peridot/public/lib/module/fidl",
- ]
-}
diff --git a/tests/common/BUILD.gn b/tests/common/BUILD.gn
index 2375832..c0aaa83 100644
--- a/tests/common/BUILD.gn
+++ b/tests/common/BUILD.gn
@@ -21,8 +21,8 @@
"//garnet/public/lib/ui/views/fidl",
"//peridot/lib/testing",
"//peridot/lib/testing:component_base",
+ "//peridot/public/lib/app_driver/cpp:module_driver",
"//peridot/public/lib/module/fidl",
- "//peridot/public/lib/module_driver/cpp",
"//peridot/public/lib/story/fidl",
]
}
diff --git a/tests/common/null_module.cc b/tests/common/null_module.cc
index bcf35e4..0cf7da8 100644
--- a/tests/common/null_module.cc
+++ b/tests/common/null_module.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "lib/app_driver/cpp/module_driver.h"
#include "lib/fsl/tasks/message_loop.h"
#include "lib/module/fidl/module.fidl.h"
#include "lib/ui/views/fidl/view_token.fidl.h"
#include "peridot/lib/testing/component_base.h"
#include "peridot/lib/testing/reporting.h"
#include "peridot/lib/testing/testing.h"
-#include "peridot/public/lib/module_driver/cpp/module_driver.h"
using modular::testing::TestPoint;
diff --git a/tests/component_context/BUILD.gn b/tests/component_context/BUILD.gn
index bd04880..676e777 100644
--- a/tests/component_context/BUILD.gn
+++ b/tests/component_context/BUILD.gn
@@ -26,9 +26,9 @@
"//garnet/public/lib/fsl",
"//peridot/lib/fidl:message_receiver_client",
"//peridot/lib/testing",
+ "//peridot/public/lib/app_driver/cpp:module_driver",
"//peridot/public/lib/component/fidl",
"//peridot/public/lib/module/fidl",
- "//peridot/public/lib/module_driver/cpp",
"//peridot/public/lib/story/fidl",
]
}
@@ -44,7 +44,7 @@
"//garnet/public/lib/fsl",
"//peridot/lib/testing",
"//peridot/public/lib/agent/fidl",
- "//peridot/public/lib/agent_driver/cpp",
+ "//peridot/public/lib/app_driver/cpp:agent_driver",
]
}
@@ -58,7 +58,7 @@
"//garnet/public/lib/fsl",
"//peridot/lib/testing",
"//peridot/public/lib/agent/fidl",
- "//peridot/public/lib/agent_driver/cpp",
+ "//peridot/public/lib/app_driver/cpp:agent_driver",
]
}
@@ -72,7 +72,7 @@
"//garnet/public/lib/fsl",
"//peridot/lib/testing",
"//peridot/public/lib/agent/fidl",
- "//peridot/public/lib/agent_driver/cpp",
+ "//peridot/public/lib/app_driver/cpp:agent_driver",
]
}
diff --git a/tests/component_context/root_module.cc b/tests/component_context/root_module.cc
index 29ab1bc..3cf0b1c 100644
--- a/tests/component_context/root_module.cc
+++ b/tests/component_context/root_module.cc
@@ -5,12 +5,12 @@
#include <utility>
#include "lib/app/cpp/connect.h"
+#include "lib/app_driver/cpp/module_driver.h"
#include "lib/component/fidl/component_context.fidl.h"
#include "lib/component/fidl/message_queue.fidl.h"
#include "lib/fsl/tasks/message_loop.h"
#include "lib/fxl/memory/weak_ptr.h"
#include "lib/module/fidl/module.fidl.h"
-#include "lib/module_driver/cpp/module_driver.h"
#include "peridot/lib/fidl/message_receiver_client.h"
#include "peridot/lib/testing/reporting.h"
#include "peridot/lib/testing/testing.h"
diff --git a/tests/component_context/test_agent1.cc b/tests/component_context/test_agent1.cc
index d1e16e7..504e6ab 100644
--- a/tests/component_context/test_agent1.cc
+++ b/tests/component_context/test_agent1.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "lib/agent/fidl/agent.fidl.h"
-#include "lib/agent_driver/cpp/agent_driver.h"
+#include "lib/app_driver/cpp/agent_driver.h"
#include "lib/fsl/tasks/message_loop.h"
#include "lib/fxl/logging.h"
#include "peridot/lib/testing/reporting.h"
diff --git a/tests/component_context/test_agent2.cc b/tests/component_context/test_agent2.cc
index b2b8fc9..4b5420e 100644
--- a/tests/component_context/test_agent2.cc
+++ b/tests/component_context/test_agent2.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "lib/agent/fidl/agent.fidl.h"
-#include "lib/agent_driver/cpp/agent_driver.h"
+#include "lib/app_driver/cpp/agent_driver.h"
#include "lib/fsl/tasks/message_loop.h"
#include "lib/fxl/logging.h"
#include "peridot/lib/testing/reporting.h"
diff --git a/tests/component_context/unstoppable_agent.cc b/tests/component_context/unstoppable_agent.cc
index 82d3ca0..81fc1b3 100644
--- a/tests/component_context/unstoppable_agent.cc
+++ b/tests/component_context/unstoppable_agent.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "lib/agent/fidl/agent.fidl.h"
-#include "lib/agent_driver/cpp/agent_driver.h"
+#include "lib/app_driver/cpp/agent_driver.h"
#include "lib/fsl/tasks/message_loop.h"
#include "lib/fxl/logging.h"
#include "peridot/lib/testing/reporting.h"
diff --git a/tests/context_link/BUILD.gn b/tests/context_link/BUILD.gn
index d2d73b9..1a37b54 100644
--- a/tests/context_link/BUILD.gn
+++ b/tests/context_link/BUILD.gn
@@ -46,8 +46,8 @@
"//garnet/public/lib/ui/views/fidl",
"//peridot/lib/testing",
"//peridot/lib/testing:component_base",
+ "//peridot/public/lib/app_driver/cpp:module_driver",
"//peridot/public/lib/module/fidl",
- "//peridot/public/lib/module_driver/cpp",
"//peridot/public/lib/story/fidl",
]
}
diff --git a/tests/context_link/context_link_module.cc b/tests/context_link/context_link_module.cc
index 920dd42..204ec2b 100644
--- a/tests/context_link/context_link_module.cc
+++ b/tests/context_link/context_link_module.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "lib/app_driver/cpp/module_driver.h"
#include "lib/fsl/tasks/message_loop.h"
#include "lib/fxl/tasks/task_runner.h"
#include "lib/fxl/time/time_delta.h"
#include "lib/module/fidl/module.fidl.h"
-#include "lib/module_driver/cpp/module_driver.h"
#include "lib/story/fidl/link.fidl.h"
#include "lib/ui/views/fidl/view_token.fidl.h"
#include "peridot/lib/testing/reporting.h"
diff --git a/tests/parent_child/BUILD.gn b/tests/parent_child/BUILD.gn
index d0b1ab6..3d7574f 100644
--- a/tests/parent_child/BUILD.gn
+++ b/tests/parent_child/BUILD.gn
@@ -21,8 +21,8 @@
"//garnet/public/lib/fsl",
"//garnet/public/lib/ui/views/fidl",
"//peridot/lib/testing",
+ "//peridot/public/lib/app_driver/cpp:module_driver",
"//peridot/public/lib/module/fidl",
- "//peridot/public/lib/module_driver/cpp",
"//peridot/public/lib/story/fidl",
]
}
@@ -37,8 +37,8 @@
"//garnet/public/lib/fsl",
"//garnet/public/lib/ui/views/fidl",
"//peridot/lib/testing",
+ "//peridot/public/lib/app_driver/cpp:module_driver",
"//peridot/public/lib/module/fidl",
- "//peridot/public/lib/module_driver/cpp",
"//peridot/public/lib/story/fidl",
]
}
diff --git a/tests/parent_child/child_module.cc b/tests/parent_child/child_module.cc
index 3475684..7377c1c 100644
--- a/tests/parent_child/child_module.cc
+++ b/tests/parent_child/child_module.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "lib/app_driver/cpp/module_driver.h"
#include "lib/fsl/tasks/message_loop.h"
#include "lib/module/fidl/module.fidl.h"
-#include "lib/module_driver/cpp/module_driver.h"
#include "lib/ui/views/fidl/view_token.fidl.h"
#include "peridot/lib/testing/reporting.h"
#include "peridot/lib/testing/testing.h"
diff --git a/tests/parent_child/parent_module.cc b/tests/parent_child/parent_module.cc
index c5897f1..46a2c17 100644
--- a/tests/parent_child/parent_module.cc
+++ b/tests/parent_child/parent_module.cc
@@ -4,10 +4,10 @@
#include <iostream>
+#include "lib/app_driver/cpp/module_driver.h"
#include "lib/fsl/tasks/message_loop.h"
#include "lib/fxl/memory/weak_ptr.h"
#include "lib/module/fidl/module.fidl.h"
-#include "lib/module_driver/cpp/module_driver.h"
#include "lib/ui/views/fidl/view_token.fidl.h"
#include "peridot/lib/testing/reporting.h"
#include "peridot/lib/testing/testing.h"
diff --git a/tests/queue_persistence/BUILD.gn b/tests/queue_persistence/BUILD.gn
index 4450857..7342871 100644
--- a/tests/queue_persistence/BUILD.gn
+++ b/tests/queue_persistence/BUILD.gn
@@ -23,9 +23,9 @@
":queue_persistence_test_agent_interface",
"//garnet/public/lib/fsl",
"//peridot/lib/testing",
+ "//peridot/public/lib/app_driver/cpp:module_driver",
"//peridot/public/lib/component/fidl",
"//peridot/public/lib/module/fidl",
- "//peridot/public/lib/module_driver/cpp",
"//peridot/public/lib/story/fidl",
]
}
@@ -42,7 +42,7 @@
"//peridot/lib/fidl:message_receiver_client",
"//peridot/lib/testing",
"//peridot/public/lib/agent/fidl",
- "//peridot/public/lib/agent_driver/cpp",
+ "//peridot/public/lib/app_driver/cpp:agent_driver",
"//peridot/public/lib/component/fidl",
]
}
diff --git a/tests/queue_persistence/queue_persistence_test_agent.cc b/tests/queue_persistence/queue_persistence_test_agent.cc
index 5f91a5b..fdb079b 100644
--- a/tests/queue_persistence/queue_persistence_test_agent.cc
+++ b/tests/queue_persistence/queue_persistence_test_agent.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "lib/agent/fidl/agent.fidl.h"
-#include "lib/agent_driver/cpp/agent_driver.h"
+#include "lib/app_driver/cpp/agent_driver.h"
#include "lib/component/fidl/message_queue.fidl.h"
#include "lib/fsl/tasks/message_loop.h"
#include "lib/fxl/logging.h"
diff --git a/tests/queue_persistence/queue_persistence_test_module.cc b/tests/queue_persistence/queue_persistence_test_module.cc
index 5d91436..9c959f3 100644
--- a/tests/queue_persistence/queue_persistence_test_module.cc
+++ b/tests/queue_persistence/queue_persistence_test_module.cc
@@ -3,11 +3,11 @@
// found in the LICENSE file.
#include "lib/app/cpp/connect.h"
+#include "lib/app_driver/cpp/module_driver.h"
#include "lib/component/fidl/component_context.fidl.h"
#include "lib/fsl/tasks/message_loop.h"
#include "lib/fxl/memory/weak_ptr.h"
#include "lib/module/fidl/module.fidl.h"
-#include "lib/module_driver/cpp/module_driver.h"
#include "peridot/lib/testing/reporting.h"
#include "peridot/lib/testing/testing.h"
#include "peridot/lib/util/weak_callback.h"
diff --git a/tests/remote/BUILD.gn b/tests/remote/BUILD.gn
index 8692670..d3732ee 100644
--- a/tests/remote/BUILD.gn
+++ b/tests/remote/BUILD.gn
@@ -22,9 +22,9 @@
"//garnet/public/lib/fsl",
"//peridot/lib/fidl:array_to_string",
"//peridot/lib/testing",
+ "//peridot/public/lib/app_driver/cpp:module_driver",
"//peridot/public/lib/component/fidl",
"//peridot/public/lib/module/fidl",
- "//peridot/public/lib/module_driver/cpp",
"//peridot/public/lib/remote/fidl",
"//peridot/public/lib/story/fidl",
"//peridot/public/lib/user/fidl",
diff --git a/tests/remote/remote_invoker_test_module.cc b/tests/remote/remote_invoker_test_module.cc
index e91772e..10bbe45 100644
--- a/tests/remote/remote_invoker_test_module.cc
+++ b/tests/remote/remote_invoker_test_module.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "lib/app/cpp/connect.h"
+#include "lib/app_driver/cpp/module_driver.h"
#include "lib/component/fidl/component_context.fidl.h"
#include "lib/fidl/cpp/bindings/binding_set.h"
#include "lib/fidl/cpp/bindings/interface_request.h"
@@ -11,7 +12,6 @@
#include "lib/lifecycle/fidl/lifecycle.fidl.h"
#include "lib/module/fidl/module.fidl.h"
#include "lib/module/fidl/module_context.fidl.h"
-#include "lib/module_driver/cpp/module_driver.h"
#include "lib/remote/fidl/remote_invoker.fidl.h"
#include "lib/user/fidl/device_map.fidl.h"
#include "peridot/lib/testing/reporting.h"
diff --git a/tests/suggestion/BUILD.gn b/tests/suggestion/BUILD.gn
index e84219b..7453487 100644
--- a/tests/suggestion/BUILD.gn
+++ b/tests/suggestion/BUILD.gn
@@ -21,8 +21,8 @@
"//garnet/public/lib/fsl",
"//peridot/lib/testing",
"//peridot/lib/testing:component_base",
+ "//peridot/public/lib/app_driver/cpp:module_driver",
"//peridot/public/lib/component/fidl",
- "//peridot/public/lib/module_driver/cpp",
"//peridot/public/lib/story/fidl",
"//peridot/public/lib/suggestion/fidl",
]
diff --git a/tests/suggestion/suggestion_proposal_test_module.cc b/tests/suggestion/suggestion_proposal_test_module.cc
index 5c85959..f244e15 100644
--- a/tests/suggestion/suggestion_proposal_test_module.cc
+++ b/tests/suggestion/suggestion_proposal_test_module.cc
@@ -3,9 +3,9 @@
// found in the LICENSE file.
#include "lib/app/cpp/connect.h"
+#include "lib/app_driver/cpp/module_driver.h"
#include "lib/fsl/tasks/message_loop.h"
#include "lib/module/fidl/module.fidl.h"
-#include "lib/module_driver/cpp/module_driver.h"
#include "lib/suggestion/fidl/proposal.fidl.h"
#include "lib/suggestion/fidl/proposal_publisher.fidl.h"
#include "peridot/lib/testing/reporting.h"
diff --git a/tests/triggers/BUILD.gn b/tests/triggers/BUILD.gn
index 6ea90e9..318b45f 100644
--- a/tests/triggers/BUILD.gn
+++ b/tests/triggers/BUILD.gn
@@ -23,9 +23,9 @@
":trigger_test_agent_interface",
"//garnet/public/lib/fsl",
"//peridot/lib/testing",
+ "//peridot/public/lib/app_driver/cpp:module_driver",
"//peridot/public/lib/component/fidl",
"//peridot/public/lib/module/fidl",
- "//peridot/public/lib/module_driver/cpp",
"//peridot/public/lib/story/fidl",
]
}
@@ -41,7 +41,7 @@
"//garnet/public/lib/fsl",
"//peridot/lib/testing",
"//peridot/public/lib/agent/fidl",
- "//peridot/public/lib/agent_driver/cpp",
+ "//peridot/public/lib/app_driver/cpp:agent_driver",
"//peridot/public/lib/lifecycle/fidl",
]
}
diff --git a/tests/triggers/root_module.cc b/tests/triggers/root_module.cc
index 3e34f66..29e1f9b 100644
--- a/tests/triggers/root_module.cc
+++ b/tests/triggers/root_module.cc
@@ -3,10 +3,10 @@
// found in the LICENSE file.
#include "lib/app/cpp/connect.h"
+#include "lib/app_driver/cpp/module_driver.h"
#include "lib/component/fidl/component_context.fidl.h"
#include "lib/fsl/tasks/message_loop.h"
#include "lib/module/fidl/module.fidl.h"
-#include "lib/module_driver/cpp/module_driver.h"
#include "peridot/lib/testing/reporting.h"
#include "peridot/lib/testing/testing.h"
#include "peridot/lib/util/weak_callback.h"
diff --git a/tests/triggers/test_agent.cc b/tests/triggers/test_agent.cc
index 72778fe..4bb5e97 100644
--- a/tests/triggers/test_agent.cc
+++ b/tests/triggers/test_agent.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "lib/agent/fidl/agent.fidl.h"
-#include "lib/agent_driver/cpp/agent_driver.h"
+#include "lib/app_driver/cpp/agent_driver.h"
#include "lib/fsl/tasks/message_loop.h"
#include "lib/fxl/logging.h"
#include "lib/lifecycle/fidl/lifecycle.fidl.h"
