[#3490] Post rebase updates

Author: fxdupont

src/bin/d2/tests/d2_http_command_unittest.cc

@@ -17,7 +17,7 @@
 #include <d2/parser_context.h>
 #include <http/response.h>
 #include <http/response_parser.h>
-#include <http/tests/test_http_client.h>
+#include <http/testutils/test_http_client.h>
 #include <gtest/gtest.h>
 #include <boost/pointer_cast.hpp>
 #include <atomic>

src/bin/dhcp4/tests/http_control_socket_unittest.cc

@@ -24,7 +24,7 @@
 #include <hooks/hooks_manager.h>
 #include <http/response.h>
 #include <http/response_parser.h>
-#include <http/tests/test_http_client.h>
+#include <http/testutils/test_http_client.h>
 #include <log/logger_support.h>
 #include <stats/stats_mgr.h>
 #include <util/chrono_time_utils.h>

src/bin/dhcp6/tests/http_control_socket_unittest.cc

@@ -23,7 +23,7 @@
 #include <hooks/hooks_manager.h>
 #include <http/response.h>
 #include <http/response_parser.h>
-#include <http/tests/test_http_client.h>
+#include <http/testutils/test_http_client.h>
 #include <log/logger_support.h>
 #include <stats/stats_mgr.h>
 #include <util/chrono_time_utils.h>

src/lib/config/tests/http_command_mgr_unittests.cc

@@ -14,7 +14,7 @@
 #include <config/command_mgr.h>
 #include <http/response.h>
 #include <http/response_parser.h>
-#include <http/tests/test_http_client.h>
+#include <http/testutils/test_http_client.h>
 #include <testutils/gtest_utils.h>
 
 #include <gtest/gtest.h>