5 files changed, 17 insertions, 17 deletions
diff --git a/tests/integration/ap_interface_test.cpp b/tests/integration/ap_interface_test.cpp
index 3af92f7..f5812c6 100644
--- a/tests/integration/ap_interface_test.cpp
+++ b/tests/integration/ap_interface_test.cpp
@@ -20,13 +20,13 @@
 #include <utils/StrongPointer.h>
 #include <wifi_system/interface_tool.h>
 
-#include "android/net/wifi/IApInterface.h"
-#include "android/net/wifi/IWificond.h"
+#include "android/net/wifi/nl80211/IApInterface.h"
+#include "android/net/wifi/nl80211/IWificond.h"
 #include "wificond/tests/integration/process_utils.h"
 #include "wificond/tests/mock_ap_interface_event_callback.h"
 
-using android::net::wifi::IApInterface;
-using android::net::wifi::IWificond;
+using android::net::wifi::nl80211::IApInterface;
+using android::net::wifi::nl80211::IWificond;
 using android::wifi_system::InterfaceTool;
 using android::wificond::MockApInterfaceEventCallback;
 using android::wificond::tests::integration::ScopedDevModeWificond;
diff --git a/tests/integration/client_interface_test.cpp b/tests/integration/client_interface_test.cpp
index 37b9dba..43ec0f2 100644
--- a/tests/integration/client_interface_test.cpp
+++ b/tests/integration/client_interface_test.cpp
@@ -21,12 +21,12 @@
 #include <utils/StrongPointer.h>
 #include <wifi_system/interface_tool.h>
 
-#include "android/net/wifi/IClientInterface.h"
-#include "android/net/wifi/IWificond.h"
+#include "android/net/wifi/nl80211/IClientInterface.h"
+#include "android/net/wifi/nl80211/IWificond.h"
 #include "wificond/tests/integration/process_utils.h"
 
-using android::net::wifi::IClientInterface;
-using android::net::wifi::IWificond;
+using android::net::wifi::nl80211::IClientInterface;
+using android::net::wifi::nl80211::IWificond;
 using android::wifi_system::InterfaceTool;
 using android::wificond::tests::integration::ScopedDevModeWificond;
 using std::string;
diff --git a/tests/integration/process_utils.cpp b/tests/integration/process_utils.cpp
index e1c7b8f..80d74f3 100644
--- a/tests/integration/process_utils.cpp
+++ b/tests/integration/process_utils.cpp
@@ -32,7 +32,7 @@
 using android::String16;
 using android::base::StringPrintf;
 using android::base::Trim;
-using android::net::wifi::IWificond;
+using android::net::wifi::nl80211::IWificond;
 using android::sp;
 using android::wificond::ipc_constants::kServiceName;
 
diff --git a/tests/integration/process_utils.h b/tests/integration/process_utils.h
index 1bec3ea..6101857 100644
--- a/tests/integration/process_utils.h
+++ b/tests/integration/process_utils.h
@@ -24,7 +24,7 @@
 #include <android-base/macros.h>
 #include <utils/StrongPointer.h>
 
-#include "android/net/wifi/IWificond.h"
+#include "android/net/wifi/nl80211/IWificond.h"
 
 namespace android {
 namespace wificond {
@@ -57,9 +57,9 @@ class ScopedDevModeWificond final {
   // This makes avoids the nastiness of restarting a system process
   // because you instantiated an object.
   // ASSERTs that wificond starts in dev mode.
-  android::sp<android::net::wifi::IWificond> EnterDevModeOrDie();
+  android::sp<android::net::wifi::nl80211::IWificond> EnterDevModeOrDie();
   // Returns true iff wificond entered dev mode.
-  android::sp<android::net::wifi::IWificond> MaybeEnterDevMode();
+  android::sp<android::net::wifi::nl80211::IWificond> MaybeEnterDevMode();
 
   // This will be called for you in the destructor, but you can do it yourself
   // if you prefer.
diff --git a/tests/integration/scanner_test.cpp b/tests/integration/scanner_test.cpp
index 1844045..ff817e4 100644
--- a/tests/integration/scanner_test.cpp
+++ b/tests/integration/scanner_test.cpp
@@ -20,13 +20,13 @@
 #include <gtest/gtest.h>
 #include <utils/StrongPointer.h>
 
-#include "android/net/wifi/IClientInterface.h"
-#include "android/net/wifi/IWificond.h"
+#include "android/net/wifi/nl80211/IClientInterface.h"
+#include "android/net/wifi/nl80211/IWificond.h"
 #include "wificond/tests/integration/process_utils.h"
 
-using android::net::wifi::IClientInterface;
-using android::net::wifi::IWificond;
-using android::net::wifi::IWifiScannerImpl;
+using android::net::wifi::nl80211::IClientInterface;
+using android::net::wifi::nl80211::IWificond;
+using android::net::wifi::nl80211::IWifiScannerImpl;
 using android::wificond::tests::integration::ScopedDevModeWificond;
 using std::unique_ptr;
 using std::vector;