Move ProxyResolver to common.
HttpFetcher depends on it and HttpFetcher is in common.
Bug: 28171891
Test: mma
Change-Id: I1783821c4a7d6785ee23df1cde648a3e1ea8fadf
diff --git a/Android.mk b/Android.mk
index 19ef765..c49d3c2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -131,6 +131,7 @@
common/multi_range_http_fetcher.cc \
common/platform_constants_android.cc \
common/prefs.cc \
+ common/proxy_resolver.cc \
common/subprocess.cc \
common/terminator.cc \
common/utils.cc \
@@ -317,7 +318,6 @@
p2p_manager.cc \
payload_state.cc \
power_manager_android.cc \
- proxy_resolver.cc \
real_system_state.cc \
update_attempter.cc \
update_boot_flags_action.cc \
@@ -420,7 +420,6 @@
metrics_reporter_android.cc \
metrics_utils.cc \
network_selector_android.cc \
- proxy_resolver.cc \
update_attempter_android.cc \
update_boot_flags_action.cc \
update_status_utils.cc
@@ -495,7 +494,6 @@
metrics_reporter_stub.cc \
metrics_utils.cc \
network_selector_stub.cc \
- proxy_resolver.cc \
sideload_main.cc \
update_attempter_android.cc \
update_boot_flags_action.cc \
@@ -936,6 +934,7 @@
common/hwid_override_unittest.cc \
common/mock_http_fetcher.cc \
common/prefs_unittest.cc \
+ common/proxy_resolver_unittest.cc \
common/subprocess_unittest.cc \
common/terminator_unittest.cc \
common/test_utils.cc \
@@ -976,7 +975,6 @@
payload_generator/tarjan_unittest.cc \
payload_generator/topological_sort_unittest.cc \
payload_generator/zip_unittest.cc \
- proxy_resolver_unittest.cc \
testrunner.cc
ifeq ($(local_use_omaha),1)
LOCAL_C_INCLUDES += \
diff --git a/chrome_browser_proxy_resolver.h b/chrome_browser_proxy_resolver.h
index fcf85b6..10a55fb 100644
--- a/chrome_browser_proxy_resolver.h
+++ b/chrome_browser_proxy_resolver.h
@@ -24,7 +24,7 @@
#include <base/memory/weak_ptr.h>
-#include "update_engine/proxy_resolver.h"
+#include "update_engine/common/proxy_resolver.h"
namespace chromeos_update_engine {
diff --git a/common/http_fetcher.h b/common/http_fetcher.h
index b2fba1c..1f5c945 100644
--- a/common/http_fetcher.h
+++ b/common/http_fetcher.h
@@ -28,7 +28,7 @@
#include <brillo/message_loops/message_loop.h>
#include "update_engine/common/http_common.h"
-#include "update_engine/proxy_resolver.h"
+#include "update_engine/common/proxy_resolver.h"
// This class is a simple wrapper around an HTTP library (libcurl). We can
// easily mock out this interface for testing.
diff --git a/common/http_fetcher_unittest.cc b/common/http_fetcher_unittest.cc
index 23df67a..66767fb 100644
--- a/common/http_fetcher_unittest.cc
+++ b/common/http_fetcher_unittest.cc
@@ -44,12 +44,12 @@
#include "update_engine/common/file_fetcher.h"
#include "update_engine/common/http_common.h"
#include "update_engine/common/mock_http_fetcher.h"
+#include "update_engine/common/mock_proxy_resolver.h"
#include "update_engine/common/multi_range_http_fetcher.h"
+#include "update_engine/common/proxy_resolver.h"
#include "update_engine/common/test_utils.h"
#include "update_engine/common/utils.h"
#include "update_engine/libcurl_http_fetcher.h"
-#include "update_engine/mock_proxy_resolver.h"
-#include "update_engine/proxy_resolver.h"
using brillo::MessageLoop;
using std::make_pair;
diff --git a/mock_proxy_resolver.h b/common/mock_proxy_resolver.h
similarity index 82%
rename from mock_proxy_resolver.h
rename to common/mock_proxy_resolver.h
index bd6d04f..67de68f 100644
--- a/mock_proxy_resolver.h
+++ b/common/mock_proxy_resolver.h
@@ -14,14 +14,14 @@
// limitations under the License.
//
-#ifndef UPDATE_ENGINE_MOCK_PROXY_RESOLVER_H_
-#define UPDATE_ENGINE_MOCK_PROXY_RESOLVER_H_
+#ifndef UPDATE_ENGINE_COMMON_MOCK_PROXY_RESOLVER_H_
+#define UPDATE_ENGINE_COMMON_MOCK_PROXY_RESOLVER_H_
#include <string>
#include <gmock/gmock.h>
-#include "update_engine/proxy_resolver.h"
+#include "update_engine/common/proxy_resolver.h"
namespace chromeos_update_engine {
@@ -35,4 +35,4 @@
} // namespace chromeos_update_engine
-#endif // UPDATE_ENGINE_MOCK_PROXY_RESOLVER_H_
+#endif // UPDATE_ENGINE_COMMON_MOCK_PROXY_RESOLVER_H_
diff --git a/proxy_resolver.cc b/common/proxy_resolver.cc
similarity index 97%
rename from proxy_resolver.cc
rename to common/proxy_resolver.cc
index 2ec59db..0591c3e 100644
--- a/proxy_resolver.cc
+++ b/common/proxy_resolver.cc
@@ -14,7 +14,7 @@
// limitations under the License.
//
-#include "update_engine/proxy_resolver.h"
+#include "update_engine/common/proxy_resolver.h"
#include <base/bind.h>
#include <base/location.h>
@@ -63,5 +63,4 @@
callback.Run(proxies);
}
-
} // namespace chromeos_update_engine
diff --git a/proxy_resolver.h b/common/proxy_resolver.h
similarity index 95%
rename from proxy_resolver.h
rename to common/proxy_resolver.h
index 19a400f..9bd51fc 100644
--- a/proxy_resolver.h
+++ b/common/proxy_resolver.h
@@ -14,8 +14,8 @@
// limitations under the License.
//
-#ifndef UPDATE_ENGINE_PROXY_RESOLVER_H_
-#define UPDATE_ENGINE_PROXY_RESOLVER_H_
+#ifndef UPDATE_ENGINE_COMMON_PROXY_RESOLVER_H_
+#define UPDATE_ENGINE_COMMON_PROXY_RESOLVER_H_
#include <deque>
#include <string>
@@ -95,4 +95,4 @@
} // namespace chromeos_update_engine
-#endif // UPDATE_ENGINE_PROXY_RESOLVER_H_
+#endif // UPDATE_ENGINE_COMMON_PROXY_RESOLVER_H_
diff --git a/proxy_resolver_unittest.cc b/common/proxy_resolver_unittest.cc
similarity index 97%
rename from proxy_resolver_unittest.cc
rename to common/proxy_resolver_unittest.cc
index 484aae1..101bf6b 100644
--- a/proxy_resolver_unittest.cc
+++ b/common/proxy_resolver_unittest.cc
@@ -14,7 +14,7 @@
// limitations under the License.
//
-#include "update_engine/proxy_resolver.h"
+#include "update_engine/common/proxy_resolver.h"
#include <deque>
#include <string>
diff --git a/update_attempter.h b/update_attempter.h
index 108a6c6..99bde83 100644
--- a/update_attempter.h
+++ b/update_attempter.h
@@ -36,11 +36,11 @@
#include "update_engine/client_library/include/update_engine/update_status.h"
#include "update_engine/common/action_processor.h"
#include "update_engine/common/cpu_limiter.h"
+#include "update_engine/common/proxy_resolver.h"
#include "update_engine/omaha_request_params.h"
#include "update_engine/omaha_response_handler_action.h"
#include "update_engine/payload_consumer/download_action.h"
#include "update_engine/payload_consumer/postinstall_runner_action.h"
-#include "update_engine/proxy_resolver.h"
#include "update_engine/service_observer_interface.h"
#include "update_engine/system_state.h"
#include "update_engine/update_manager/policy.h"
diff --git a/update_engine.gyp b/update_engine.gyp
index c90c018..358f64a 100644
--- a/update_engine.gyp
+++ b/update_engine.gyp
@@ -168,6 +168,7 @@
'common/multi_range_http_fetcher.cc',
'common/platform_constants_chromeos.cc',
'common/prefs.cc',
+ 'common/proxy_resolver.cc',
'common/subprocess.cc',
'common/terminator.cc',
'common/utils.cc',
@@ -270,7 +271,6 @@
'p2p_manager.cc',
'payload_state.cc',
'power_manager_chromeos.cc',
- 'proxy_resolver.cc',
'real_system_state.cc',
'shill_proxy.cc',
'update_attempter.cc',
@@ -518,6 +518,7 @@
'common/hwid_override_unittest.cc',
'common/mock_http_fetcher.cc',
'common/prefs_unittest.cc',
+ 'common/proxy_resolver_unittest.cc',
'common/subprocess_unittest.cc',
'common/terminator_unittest.cc',
'common/test_utils.cc',
@@ -571,7 +572,6 @@
'payload_generator/topological_sort_unittest.cc',
'payload_generator/zip_unittest.cc',
'payload_state_unittest.cc',
- 'proxy_resolver_unittest.cc',
'testrunner.cc',
'update_attempter_unittest.cc',
'update_boot_flags_action_unittest.cc',