Update on "[ExecuTorch][#10447] Extend PyBundledModule with extension.BundledModule"

#10447

# Context

This issue is a step of #9638.

In #9638, we want to have `extension.Module` as the single source of implementation in `pybindings`, which means that `pybindings.PyModule` should use `extension.Module` rather than its own `pybindings.Module`.

# Proposal

Now that we have `extension.BundledModule` ready, we want to test it out by having our existing `PyBundledModule` to extend it, and let `verify_result_with_bundled_expected_output` to use it, so that we can test out the whole thing with https://github.com/pytorch/executorch/blob/fb45e19055a92d2a91a4d4b7008e135232cbb14b/devtools/bundled_program/test/test_end2end.py

Differential Revision: [D73564127](https://our.internmc.facebook.com/intern/diff/D73564127/)

[ghstack-poisoned]

Author: zhenyan-zhang-meta

extension/module/bundled_module.h

@@ -16,12 +16,12 @@
 #define ET_BUNDLED_MODULE_NAMESPACE bundled_module
 #endif // USE_ATEN_LIB
 
-using executorch::extension::ET_MODULE_NAMESPACE::Module;
-
 namespace executorch {
 namespace extension {
 namespace ET_BUNDLED_MODULE_NAMESPACE {
 
+using executorch::extension::ET_MODULE_NAMESPACE::Module;
+
 /**
  * A facade class for loading bundled programs and executing methods within
  * them.

extension/module/module.h

@@ -24,13 +24,16 @@
 
 namespace executorch {
 namespace extension {
-namespace ET_MODULE_NAMESPACE {
 
 using ET_RUNTIME_NAMESPACE::Method;
 using ET_RUNTIME_NAMESPACE::MethodMeta;
 using ET_RUNTIME_NAMESPACE::NamedDataMap;
 using ET_RUNTIME_NAMESPACE::Program;
 
+class ExecuTorchJni;
+
+namespace ET_MODULE_NAMESPACE {
+
 /**
  * A facade class for loading programs and executing methods within them.
  */
@@ -500,7 +503,7 @@ class Module {
  protected:
   std::unordered_map<std::string, MethodHolder> methods_;
 
-  friend class ExecuTorchJni;
+  friend class executorch::extension::ExecuTorchJni;
 };
 
 } // namespace ET_MODULE_NAMESPACE
@@ -518,6 +521,6 @@ using ::executorch::extension::ET_MODULE_NAMESPACE::Module;
 namespace executorch {
 namespace extension {
 // backward compatible namespace alias
-using namespace ::executorch::extension::ET_MODULE_NAMESPACE;
+using ::executorch::extension::ET_MODULE_NAMESPACE::Module;
 } // namespace extension
 } // namespace executorch