shill: wimax: Move wimax code to its own sub-directory.
This CL is part of a series of CLs, which aim to reorganzie shill's flat
source code structure into a more modular form by moving technology
specific code into their own sub-directories.
BUG=chromium:433419
TEST=`USE='wimax' FEATURES=test emerge-$BOARD shill`
TEST=`USE='wimax clang asan' FEATURES=test emerge-$BOARD shill`
Change-Id: I6b2be3550026cb2e176c0107d10da1e29d2606b0
Reviewed-on: https://chromium-review.googlesource.com/229798
Reviewed-by: Paul Stewart <pstew@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
diff --git a/device_info_unittest.cc b/device_info_unittest.cc
index 6ad501a..fada965 100644
--- a/device_info_unittest.cc
+++ b/device_info_unittest.cc
@@ -36,7 +36,6 @@
#include "shill/mock_modem_info.h"
#include "shill/mock_routing_table.h"
#include "shill/mock_vpn_provider.h"
-#include "shill/mock_wimax_provider.h"
#include "shill/net/ip_address.h"
#include "shill/net/mock_netlink_manager.h"
#include "shill/net/mock_rtnl_handler.h"
@@ -45,7 +44,8 @@
#include "shill/net/netlink_attribute.h"
#include "shill/net/nl80211_message.h"
#include "shill/net/rtnl_message.h"
-#include "shill/wimax.h"
+#include "shill/wimax/mock_wimax_provider.h"
+#include "shill/wimax/wimax.h"
using base::Callback;
using base::FilePath;
diff --git a/manager.cc b/manager.cc
index 006463d..54b43f1 100644
--- a/manager.cc
+++ b/manager.cc
@@ -51,7 +51,7 @@
#include "shill/wifi.h"
#include "shill/wifi_provider.h"
#include "shill/wifi_service.h"
-#include "shill/wimax_service.h"
+#include "shill/wimax/wimax_service.h"
using base::Bind;
using base::FilePath;
diff --git a/manager.h b/manager.h
index 3ef6feb..d0ddd65 100644
--- a/manager.h
+++ b/manager.h
@@ -31,7 +31,7 @@
#include "shill/property_store.h"
#include "shill/service.h"
#include "shill/wifi.h"
-#include "shill/wimax_provider.h"
+#include "shill/wimax/wimax_provider.h"
namespace shill {
diff --git a/manager_unittest.cc b/manager_unittest.cc
index 6381cc5..c717ccb 100644
--- a/manager_unittest.cc
+++ b/manager_unittest.cc
@@ -51,7 +51,7 @@
#include "shill/service_under_test.h"
#include "shill/testing.h"
#include "shill/wifi_service.h"
-#include "shill/wimax_service.h"
+#include "shill/wimax/wimax_service.h"
using base::Bind;
using base::FilePath;
diff --git a/proxy_factory.cc b/proxy_factory.cc
index c202577..85f4177 100644
--- a/proxy_factory.cc
+++ b/proxy_factory.cc
@@ -34,9 +34,9 @@
#endif
#if !defined(DISABLE_WIMAX)
-#include "shill/wimax_device_proxy.h"
-#include "shill/wimax_manager_proxy.h"
-#include "shill/wimax_network_proxy.h"
+#include "shill/wimax/wimax_device_proxy.h"
+#include "shill/wimax/wimax_manager_proxy.h"
+#include "shill/wimax/wimax_network_proxy.h"
#endif
using std::string;
diff --git a/shill.gyp b/shill.gyp
index 7d23ae3..21f33a6 100644
--- a/shill.gyp
+++ b/shill.gyp
@@ -297,12 +297,12 @@
}],
['USE_wimax == 1', {
'sources': [
- 'wimax.cc',
- 'wimax_device_proxy.cc',
- 'wimax_manager_proxy.cc',
- 'wimax_network_proxy.cc',
- 'wimax_provider.cc',
- 'wimax_service.cc',
+ 'wimax/wimax.cc',
+ 'wimax/wimax_device_proxy.cc',
+ 'wimax/wimax_manager_proxy.cc',
+ 'wimax/wimax_network_proxy.cc',
+ 'wimax/wimax_provider.cc',
+ 'wimax/wimax_service.cc',
],
}],
],
@@ -775,15 +775,15 @@
}],
['USE_wimax == 1', {
'sources': [
- 'mock_wimax.cc',
- 'mock_wimax_device_proxy.cc',
- 'mock_wimax_manager_proxy.cc',
- 'mock_wimax_network_proxy.cc',
- 'mock_wimax_provider.cc',
- 'mock_wimax_service.cc',
- 'wimax_provider_unittest.cc',
- 'wimax_service_unittest.cc',
- 'wimax_unittest.cc',
+ 'wimax/mock_wimax.cc',
+ 'wimax/mock_wimax_device_proxy.cc',
+ 'wimax/mock_wimax_manager_proxy.cc',
+ 'wimax/mock_wimax_network_proxy.cc',
+ 'wimax/mock_wimax_provider.cc',
+ 'wimax/mock_wimax_service.cc',
+ 'wimax/wimax_provider_unittest.cc',
+ 'wimax/wimax_service_unittest.cc',
+ 'wimax/wimax_unittest.cc',
],
}],
],
diff --git a/mock_wimax.cc b/wimax/mock_wimax.cc
similarity index 94%
rename from mock_wimax.cc
rename to wimax/mock_wimax.cc
index aa19dcd..19d0676 100644
--- a/mock_wimax.cc
+++ b/wimax/mock_wimax.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "shill/mock_wimax.h"
+#include "shill/wimax/mock_wimax.h"
#include <string>
diff --git a/mock_wimax.h b/wimax/mock_wimax.h
similarity index 90%
rename from mock_wimax.h
rename to wimax/mock_wimax.h
index 0a17564..be08c27 100644
--- a/mock_wimax.h
+++ b/wimax/mock_wimax.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SHILL_MOCK_WIMAX_H_
-#define SHILL_MOCK_WIMAX_H_
+#ifndef SHILL_WIMAX_MOCK_WIMAX_H_
+#define SHILL_WIMAX_MOCK_WIMAX_H_
#include <string>
#include <gmock/gmock.h>
-#include "shill/wimax.h"
+#include "shill/wimax/wimax.h"
namespace shill {
@@ -47,4 +47,4 @@
} // namespace shill
-#endif // SHILL_MOCK_WIMAX_H_
+#endif // SHILL_WIMAX_MOCK_WIMAX_H_
diff --git a/mock_wimax_device_proxy.cc b/wimax/mock_wimax_device_proxy.cc
similarity index 94%
rename from mock_wimax_device_proxy.cc
rename to wimax/mock_wimax_device_proxy.cc
index c6cf366..08ae0ed 100644
--- a/mock_wimax_device_proxy.cc
+++ b/wimax/mock_wimax_device_proxy.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "shill/mock_wimax_device_proxy.h"
+#include "shill/wimax/mock_wimax_device_proxy.h"
#include "shill/testing.h"
diff --git a/mock_wimax_device_proxy.h b/wimax/mock_wimax_device_proxy.h
similarity index 89%
rename from mock_wimax_device_proxy.h
rename to wimax/mock_wimax_device_proxy.h
index 4cb6a02..1ec2d1f 100644
--- a/mock_wimax_device_proxy.h
+++ b/wimax/mock_wimax_device_proxy.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SHILL_MOCK_WIMAX_DEVICE_PROXY_H_
-#define SHILL_MOCK_WIMAX_DEVICE_PROXY_H_
+#ifndef SHILL_WIMAX_MOCK_WIMAX_DEVICE_PROXY_H_
+#define SHILL_WIMAX_MOCK_WIMAX_DEVICE_PROXY_H_
#include <string>
#include <base/macros.h>
#include <gmock/gmock.h>
-#include "shill/wimax_device_proxy_interface.h"
+#include "shill/wimax/wimax_device_proxy_interface.h"
namespace shill {
@@ -50,4 +50,4 @@
} // namespace shill
-#endif // SHILL_MOCK_WIMAX_DEVICE_PROXY_H_
+#endif // SHILL_WIMAX_MOCK_WIMAX_DEVICE_PROXY_H_
diff --git a/mock_wimax_manager_proxy.cc b/wimax/mock_wimax_manager_proxy.cc
similarity index 86%
rename from mock_wimax_manager_proxy.cc
rename to wimax/mock_wimax_manager_proxy.cc
index b2bceed..c29667a 100644
--- a/mock_wimax_manager_proxy.cc
+++ b/wimax/mock_wimax_manager_proxy.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "shill/mock_wimax_manager_proxy.h"
+#include "shill/wimax/mock_wimax_manager_proxy.h"
namespace shill {
diff --git a/mock_wimax_manager_proxy.h b/wimax/mock_wimax_manager_proxy.h
similarity index 76%
rename from mock_wimax_manager_proxy.h
rename to wimax/mock_wimax_manager_proxy.h
index 077885f..8defbbb 100644
--- a/mock_wimax_manager_proxy.h
+++ b/wimax/mock_wimax_manager_proxy.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SHILL_MOCK_WIMAX_MANAGER_PROXY_H_
-#define SHILL_MOCK_WIMAX_MANAGER_PROXY_H_
+#ifndef SHILL_WIMAX_MOCK_WIMAX_MANAGER_PROXY_H_
+#define SHILL_WIMAX_MOCK_WIMAX_MANAGER_PROXY_H_
#include <vector>
#include <base/macros.h>
#include <gmock/gmock.h>
-#include "shill/wimax_manager_proxy_interface.h"
+#include "shill/wimax/wimax_manager_proxy_interface.h"
namespace shill {
@@ -29,4 +29,4 @@
} // namespace shill
-#endif // SHILL_MOCK_WIMAX_MANAGER_PROXY_H_
+#endif // SHILL_WIMAX_MOCK_WIMAX_MANAGER_PROXY_H_
diff --git a/mock_wimax_network_proxy.cc b/wimax/mock_wimax_network_proxy.cc
similarity index 86%
rename from mock_wimax_network_proxy.cc
rename to wimax/mock_wimax_network_proxy.cc
index e6d12fd..38c88f9 100644
--- a/mock_wimax_network_proxy.cc
+++ b/wimax/mock_wimax_network_proxy.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "shill/mock_wimax_network_proxy.h"
+#include "shill/wimax/mock_wimax_network_proxy.h"
#include <base/callback.h>
diff --git a/mock_wimax_network_proxy.h b/wimax/mock_wimax_network_proxy.h
similarity index 81%
rename from mock_wimax_network_proxy.h
rename to wimax/mock_wimax_network_proxy.h
index 6b62606..63bd226 100644
--- a/mock_wimax_network_proxy.h
+++ b/wimax/mock_wimax_network_proxy.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SHILL_MOCK_WIMAX_NETWORK_PROXY_H_
-#define SHILL_MOCK_WIMAX_NETWORK_PROXY_H_
+#ifndef SHILL_WIMAX_MOCK_WIMAX_NETWORK_PROXY_H_
+#define SHILL_WIMAX_MOCK_WIMAX_NETWORK_PROXY_H_
#include <string>
#include <gmock/gmock.h>
-#include "shill/wimax_network_proxy_interface.h"
+#include "shill/wimax/wimax_network_proxy_interface.h"
namespace shill {
@@ -34,4 +34,4 @@
} // namespace shill
-#endif // SHILL_MOCK_WIMAX_NETWORK_PROXY_H_
+#endif // SHILL_WIMAX_MOCK_WIMAX_NETWORK_PROXY_H_
diff --git a/mock_wimax_provider.cc b/wimax/mock_wimax_provider.cc
similarity index 82%
rename from mock_wimax_provider.cc
rename to wimax/mock_wimax_provider.cc
index c6b9485..9128a80 100644
--- a/mock_wimax_provider.cc
+++ b/wimax/mock_wimax_provider.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 "shill/mock_wimax_provider.h"
+#include "shill/wimax/mock_wimax_provider.h"
-#include "shill/wimax.h"
+#include "shill/wimax/wimax.h"
namespace shill {
diff --git a/mock_wimax_provider.h b/wimax/mock_wimax_provider.h
similarity index 80%
rename from mock_wimax_provider.h
rename to wimax/mock_wimax_provider.h
index 5527a40..ef913f6 100644
--- a/mock_wimax_provider.h
+++ b/wimax/mock_wimax_provider.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SHILL_MOCK_WIMAX_PROVIDER_H_
-#define SHILL_MOCK_WIMAX_PROVIDER_H_
+#ifndef SHILL_WIMAX_MOCK_WIMAX_PROVIDER_H_
+#define SHILL_WIMAX_MOCK_WIMAX_PROVIDER_H_
#include <string>
#include <gmock/gmock.h>
-#include "shill/wimax_provider.h"
+#include "shill/wimax/wimax_provider.h"
namespace shill {
@@ -30,4 +30,4 @@
} // namespace shill
-#endif // SHILL_MOCK_WIMAX_PROVIDER_H_
+#endif // SHILL_WIMAX_MOCK_WIMAX_PROVIDER_H_
diff --git a/mock_wimax_service.cc b/wimax/mock_wimax_service.cc
similarity index 92%
rename from mock_wimax_service.cc
rename to wimax/mock_wimax_service.cc
index 3425d00..7f10872 100644
--- a/mock_wimax_service.cc
+++ b/wimax/mock_wimax_service.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "shill/mock_wimax_service.h"
+#include "shill/wimax/mock_wimax_service.h"
namespace shill {
diff --git a/mock_wimax_service.h b/wimax/mock_wimax_service.h
similarity index 83%
rename from mock_wimax_service.h
rename to wimax/mock_wimax_service.h
index 6e2d1b8..9890448 100644
--- a/mock_wimax_service.h
+++ b/wimax/mock_wimax_service.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SHILL_MOCK_WIMAX_SERVICE_H_
-#define SHILL_MOCK_WIMAX_SERVICE_H_
+#ifndef SHILL_WIMAX_MOCK_WIMAX_SERVICE_H_
+#define SHILL_WIMAX_MOCK_WIMAX_SERVICE_H_
#include <gmock/gmock.h>
-#include "shill/wimax_service.h"
+#include "shill/wimax/wimax_service.h"
namespace shill {
@@ -32,4 +32,4 @@
} // namespace shill
-#endif // SHILL_MOCK_WIMAX_SERVICE_H_
+#endif // SHILL_WIMAX_MOCK_WIMAX_SERVICE_H_
diff --git a/wimax.cc b/wimax/wimax.cc
similarity index 98%
rename from wimax.cc
rename to wimax/wimax.cc
index 1bbb607..54b430a 100644
--- a/wimax.cc
+++ b/wimax/wimax.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "shill/wimax.h"
+#include "shill/wimax/wimax.h"
#include <string>
@@ -14,8 +14,8 @@
#include "shill/logging.h"
#include "shill/manager.h"
#include "shill/proxy_factory.h"
-#include "shill/wimax_device_proxy_interface.h"
-#include "shill/wimax_service.h"
+#include "shill/wimax/wimax_device_proxy_interface.h"
+#include "shill/wimax/wimax_service.h"
using base::Bind;
using std::set;
diff --git a/wimax.h b/wimax/wimax.h
similarity index 97%
rename from wimax.h
rename to wimax/wimax.h
index f211b47..6688ffe 100644
--- a/wimax.h
+++ b/wimax/wimax.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 SHILL_WIMAX_H_
-#define SHILL_WIMAX_H_
+#ifndef SHILL_WIMAX_WIMAX_H_
+#define SHILL_WIMAX_WIMAX_H_
#include <memory>
#include <set>
@@ -119,4 +119,4 @@
} // namespace shill
-#endif // SHILL_WIMAX_H_
+#endif // SHILL_WIMAX_WIMAX_H_
diff --git a/wimax_device_proxy.cc b/wimax/wimax_device_proxy.cc
similarity index 98%
rename from wimax_device_proxy.cc
rename to wimax/wimax_device_proxy.cc
index 0248965..f8c9a6c 100644
--- a/wimax_device_proxy.cc
+++ b/wimax/wimax_device_proxy.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "shill/wimax_device_proxy.h"
+#include "shill/wimax/wimax_device_proxy.h"
#include <memory>
diff --git a/wimax_device_proxy.h b/wimax/wimax_device_proxy.h
similarity index 94%
rename from wimax_device_proxy.h
rename to wimax/wimax_device_proxy.h
index 5772d7f..f645d75 100644
--- a/wimax_device_proxy.h
+++ b/wimax/wimax_device_proxy.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SHILL_WIMAX_DEVICE_PROXY_H_
-#define SHILL_WIMAX_DEVICE_PROXY_H_
+#ifndef SHILL_WIMAX_WIMAX_DEVICE_PROXY_H_
+#define SHILL_WIMAX_WIMAX_DEVICE_PROXY_H_
#include <string>
#include <vector>
#include <base/callback.h>
-#include "shill/wimax_device_proxy_interface.h"
+#include "shill/wimax/wimax_device_proxy_interface.h"
#include "wimax_manager/dbus_proxies/org.chromium.WiMaxManager.Device.h"
namespace shill {
@@ -87,4 +87,4 @@
} // namespace shill
-#endif // SHILL_WIMAX_DEVICE_PROXY_H_
+#endif // SHILL_WIMAX_WIMAX_DEVICE_PROXY_H_
diff --git a/wimax_device_proxy_interface.h b/wimax/wimax_device_proxy_interface.h
similarity index 91%
rename from wimax_device_proxy_interface.h
rename to wimax/wimax_device_proxy_interface.h
index 6f67f67..875c5c5 100644
--- a/wimax_device_proxy_interface.h
+++ b/wimax/wimax_device_proxy_interface.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 SHILL_WIMAX_DEVICE_PROXY_INTERFACE_H_
-#define SHILL_WIMAX_DEVICE_PROXY_INTERFACE_H_
+#ifndef SHILL_WIMAX_WIMAX_DEVICE_PROXY_INTERFACE_H_
+#define SHILL_WIMAX_WIMAX_DEVICE_PROXY_INTERFACE_H_
#include <string>
@@ -57,4 +57,4 @@
} // namespace shill
-#endif // SHILL_WIMAX_DEVICE_PROXY_INTERFACE_H_
+#endif // SHILL_WIMAX_WIMAX_DEVICE_PROXY_INTERFACE_H_
diff --git a/wimax_manager_proxy.cc b/wimax/wimax_manager_proxy.cc
similarity index 97%
rename from wimax_manager_proxy.cc
rename to wimax/wimax_manager_proxy.cc
index 28ce060..d2d2c4b 100644
--- a/wimax_manager_proxy.cc
+++ b/wimax/wimax_manager_proxy.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "shill/wimax_manager_proxy.h"
+#include "shill/wimax/wimax_manager_proxy.h"
#include <string>
diff --git a/wimax_manager_proxy.h b/wimax/wimax_manager_proxy.h
similarity index 87%
rename from wimax_manager_proxy.h
rename to wimax/wimax_manager_proxy.h
index 320472d..88c1696 100644
--- a/wimax_manager_proxy.h
+++ b/wimax/wimax_manager_proxy.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SHILL_WIMAX_MANAGER_PROXY_H_
-#define SHILL_WIMAX_MANAGER_PROXY_H_
+#ifndef SHILL_WIMAX_WIMAX_MANAGER_PROXY_H_
+#define SHILL_WIMAX_WIMAX_MANAGER_PROXY_H_
#include <string>
#include <vector>
#include <base/macros.h>
-#include "shill/wimax_manager_proxy_interface.h"
+#include "shill/wimax/wimax_manager_proxy_interface.h"
#include "wimax_manager/dbus_proxies/org.chromium.WiMaxManager.h"
namespace shill {
@@ -53,4 +53,4 @@
} // namespace shill
-#endif // SHILL_WIMAX_MANAGER_PROXY_H_
+#endif // SHILL_WIMAX_WIMAX_MANAGER_PROXY_H_
diff --git a/wimax_manager_proxy_interface.h b/wimax/wimax_manager_proxy_interface.h
similarity index 82%
rename from wimax_manager_proxy_interface.h
rename to wimax/wimax_manager_proxy_interface.h
index 96f86d4..312a28d 100644
--- a/wimax_manager_proxy_interface.h
+++ b/wimax/wimax_manager_proxy_interface.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 SHILL_WIMAX_MANAGER_PROXY_INTERFACE_H_
-#define SHILL_WIMAX_MANAGER_PROXY_INTERFACE_H_
+#ifndef SHILL_WIMAX_WIMAX_MANAGER_PROXY_INTERFACE_H_
+#define SHILL_WIMAX_WIMAX_MANAGER_PROXY_INTERFACE_H_
#include <vector>
@@ -32,4 +32,4 @@
} // namespace shill
-#endif // SHILL_WIMAX_MANAGER_PROXY_INTERFACE_H_
+#endif // SHILL_WIMAX_WIMAX_MANAGER_PROXY_INTERFACE_H_
diff --git a/wimax_network_proxy.cc b/wimax/wimax_network_proxy.cc
similarity index 98%
rename from wimax_network_proxy.cc
rename to wimax/wimax_network_proxy.cc
index f5e97bc..be9ca74 100644
--- a/wimax_network_proxy.cc
+++ b/wimax/wimax_network_proxy.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "shill/wimax_network_proxy.h"
+#include "shill/wimax/wimax_network_proxy.h"
#include <chromeos/dbus/service_constants.h>
diff --git a/wimax_network_proxy.h b/wimax/wimax_network_proxy.h
similarity index 90%
rename from wimax_network_proxy.h
rename to wimax/wimax_network_proxy.h
index 97ab178..085c6ab 100644
--- a/wimax_network_proxy.h
+++ b/wimax/wimax_network_proxy.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SHILL_WIMAX_NETWORK_PROXY_H_
-#define SHILL_WIMAX_NETWORK_PROXY_H_
+#ifndef SHILL_WIMAX_WIMAX_NETWORK_PROXY_H_
+#define SHILL_WIMAX_WIMAX_NETWORK_PROXY_H_
#include <string>
#include <base/callback.h>
-#include "shill/wimax_network_proxy_interface.h"
+#include "shill/wimax/wimax_network_proxy_interface.h"
#include "wimax_manager/dbus_proxies/org.chromium.WiMaxManager.Network.h"
namespace shill {
@@ -63,4 +63,4 @@
} // namespace shill
-#endif // SHILL_WIMAX_NETWORK_PROXY_H_
+#endif // SHILL_WIMAX_WIMAX_NETWORK_PROXY_H_
diff --git a/wimax_network_proxy_interface.h b/wimax/wimax_network_proxy_interface.h
similarity index 88%
rename from wimax_network_proxy_interface.h
rename to wimax/wimax_network_proxy_interface.h
index 9b50c89..39ffd82 100644
--- a/wimax_network_proxy_interface.h
+++ b/wimax/wimax_network_proxy_interface.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 SHILL_WIMAX_NETWORK_PROXY_INTERFACE_H_
-#define SHILL_WIMAX_NETWORK_PROXY_INTERFACE_H_
+#ifndef SHILL_WIMAX_WIMAX_NETWORK_PROXY_INTERFACE_H_
+#define SHILL_WIMAX_WIMAX_NETWORK_PROXY_INTERFACE_H_
#include <string>
@@ -44,4 +44,4 @@
} // namespace shill
-#endif // SHILL_WIMAX_NETWORK_PROXY_INTERFACE_H_
+#endif // SHILL_WIMAX_WIMAX_NETWORK_PROXY_INTERFACE_H_
diff --git a/wimax_provider.cc b/wimax/wimax_provider.cc
similarity index 98%
rename from wimax_provider.cc
rename to wimax/wimax_provider.cc
index 4c1c8ac..a77d14e 100644
--- a/wimax_provider.cc
+++ b/wimax/wimax_provider.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "shill/wimax_provider.h"
+#include "shill/wimax/wimax_provider.h"
#include <algorithm>
#include <set>
@@ -18,9 +18,9 @@
#include "shill/profile.h"
#include "shill/proxy_factory.h"
#include "shill/store_interface.h"
-#include "shill/wimax.h"
-#include "shill/wimax_manager_proxy_interface.h"
-#include "shill/wimax_service.h"
+#include "shill/wimax/wimax.h"
+#include "shill/wimax/wimax_manager_proxy_interface.h"
+#include "shill/wimax/wimax_service.h"
using base::Bind;
using base::Unretained;
diff --git a/wimax_provider.h b/wimax/wimax_provider.h
similarity index 96%
rename from wimax_provider.h
rename to wimax/wimax_provider.h
index d528ac9..7bd78d5 100644
--- a/wimax_provider.h
+++ b/wimax/wimax_provider.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 SHILL_WIMAX_PROVIDER_H_
-#define SHILL_WIMAX_PROVIDER_H_
+#ifndef SHILL_WIMAX_WIMAX_PROVIDER_H_
+#define SHILL_WIMAX_WIMAX_PROVIDER_H_
#include <map>
#include <memory>
@@ -16,7 +16,7 @@
#include "shill/dbus_manager.h"
#include "shill/provider_interface.h"
#include "shill/refptr_types.h"
-#include "shill/wimax_network_proxy_interface.h"
+#include "shill/wimax/wimax_network_proxy_interface.h"
namespace shill {
@@ -160,4 +160,4 @@
} // namespace shill
-#endif // SHILL_WIMAX_PROVIDER_H_
+#endif // SHILL_WIMAX_WIMAX_PROVIDER_H_
diff --git a/wimax_provider_unittest.cc b/wimax/wimax_provider_unittest.cc
similarity index 98%
rename from wimax_provider_unittest.cc
rename to wimax/wimax_provider_unittest.cc
index d02f951..138793d 100644
--- a/wimax_provider_unittest.cc
+++ b/wimax/wimax_provider_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "shill/wimax_provider.h"
+#include "shill/wimax/wimax_provider.h"
#include <string>
#include <vector>
@@ -21,13 +21,13 @@
#include "shill/mock_metrics.h"
#include "shill/mock_profile.h"
#include "shill/mock_proxy_factory.h"
-#include "shill/mock_wimax.h"
-#include "shill/mock_wimax_manager_proxy.h"
-#include "shill/mock_wimax_network_proxy.h"
-#include "shill/mock_wimax_service.h"
#include "shill/nice_mock_control.h"
#include "shill/testing.h"
-#include "shill/wimax_service.h"
+#include "shill/wimax/mock_wimax.h"
+#include "shill/wimax/mock_wimax_manager_proxy.h"
+#include "shill/wimax/mock_wimax_network_proxy.h"
+#include "shill/wimax/mock_wimax_service.h"
+#include "shill/wimax/wimax_service.h"
using base::FilePath;
using std::string;
diff --git a/wimax_service.cc b/wimax/wimax_service.cc
similarity index 98%
rename from wimax_service.cc
rename to wimax/wimax_service.cc
index 569879e..6f64352 100644
--- a/wimax_service.cc
+++ b/wimax/wimax_service.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "shill/wimax_service.h"
+#include "shill/wimax/wimax_service.h"
#include <algorithm>
@@ -18,7 +18,7 @@
#include "shill/manager.h"
#include "shill/store_interface.h"
#include "shill/technology.h"
-#include "shill/wimax.h"
+#include "shill/wimax/wimax.h"
using std::replace_if;
using std::string;
diff --git a/wimax_service.h b/wimax/wimax_service.h
similarity index 95%
rename from wimax_service.h
rename to wimax/wimax_service.h
index 1bee3a3..31e7d05 100644
--- a/wimax_service.h
+++ b/wimax/wimax_service.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 SHILL_WIMAX_SERVICE_H_
-#define SHILL_WIMAX_SERVICE_H_
+#ifndef SHILL_WIMAX_WIMAX_SERVICE_H_
+#define SHILL_WIMAX_WIMAX_SERVICE_H_
#include <memory>
#include <string>
@@ -12,7 +12,7 @@
#include "shill/refptr_types.h"
#include "shill/service.h"
-#include "shill/wimax_network_proxy_interface.h"
+#include "shill/wimax/wimax_network_proxy_interface.h"
namespace shill {
@@ -114,4 +114,4 @@
} // namespace shill
-#endif // SHILL_WIMAX_SERVICE_H_
+#endif // SHILL_WIMAX_WIMAX_SERVICE_H_
diff --git a/wimax_service_unittest.cc b/wimax/wimax_service_unittest.cc
similarity index 98%
rename from wimax_service_unittest.cc
rename to wimax/wimax_service_unittest.cc
index 8f75a56..a6b7bc6 100644
--- a/wimax_service_unittest.cc
+++ b/wimax/wimax_service_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "shill/wimax_service.h"
+#include "shill/wimax/wimax_service.h"
#include <string>
@@ -16,11 +16,11 @@
#include "shill/mock_manager.h"
#include "shill/mock_metrics.h"
#include "shill/mock_store.h"
-#include "shill/mock_wimax.h"
-#include "shill/mock_wimax_network_proxy.h"
-#include "shill/mock_wimax_provider.h"
#include "shill/nice_mock_control.h"
#include "shill/service_property_change_test.h"
+#include "shill/wimax/mock_wimax.h"
+#include "shill/wimax/mock_wimax_network_proxy.h"
+#include "shill/wimax/mock_wimax_provider.h"
using std::string;
using testing::_;
diff --git a/wimax_unittest.cc b/wimax/wimax_unittest.cc
similarity index 98%
rename from wimax_unittest.cc
rename to wimax/wimax_unittest.cc
index 3c2990e..9605f7f 100644
--- a/wimax_unittest.cc
+++ b/wimax/wimax_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "shill/wimax.h"
+#include "shill/wimax/wimax.h"
#include <memory>
#include <string>
@@ -13,11 +13,11 @@
#include "shill/mock_manager.h"
#include "shill/mock_metrics.h"
#include "shill/mock_proxy_factory.h"
-#include "shill/mock_wimax_device_proxy.h"
-#include "shill/mock_wimax_provider.h"
-#include "shill/mock_wimax_service.h"
#include "shill/nice_mock_control.h"
#include "shill/testing.h"
+#include "shill/wimax/mock_wimax_device_proxy.h"
+#include "shill/wimax/mock_wimax_provider.h"
+#include "shill/wimax/mock_wimax_service.h"
using base::Bind;
using base::Unretained;