summaryrefslogtreecommitdiff
path: root/chrome_browser_proxy_resolver_unittest.cc
diff options
context:
space:
mode:
authorAlex Vakulenko <avakulenko@chromium.org>2014-06-16 13:19:00 -0700
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-06-18 01:39:59 +0000
commitd2779df63aaad8b65fc5d4badee7dbc9bed7f2b6 (patch)
treee34a511ee4068d8d9cd46a992a4e147f3afbd351 /chrome_browser_proxy_resolver_unittest.cc
parentb683327ed3f50ef89324069fc87ee076b65bee46 (diff)
update_engine: fixed warnings from cpplint
Fixed all the cpplint warnings in update engine. BUG=None TEST=Unit tests still pass. Change-Id: I285ae858eec8abe0b26ff203b99a42a200ceb71c Reviewed-on: https://chromium-review.googlesource.com/204027 Reviewed-by: Alex Vakulenko <avakulenko@chromium.org> Tested-by: Alex Vakulenko <avakulenko@chromium.org> Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>
Diffstat (limited to 'chrome_browser_proxy_resolver_unittest.cc')
-rw-r--r--chrome_browser_proxy_resolver_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_browser_proxy_resolver_unittest.cc b/chrome_browser_proxy_resolver_unittest.cc
index 9fa168e9..557fc2e2 100644
--- a/chrome_browser_proxy_resolver_unittest.cc
+++ b/chrome_browser_proxy_resolver_unittest.cc
@@ -109,7 +109,7 @@ gboolean SendReply(gpointer data) {
// chrome. If there's no reply, the resolver should time out.
// If chrome_alive is false, assume that sending to chrome fails.
void RunTest(bool chrome_replies, bool chrome_alive) {
- long number = 1;
+ intptr_t number = 1;
DBusGConnection* kMockSystemGBus =
reinterpret_cast<DBusGConnection*>(number++);
DBusConnection* kMockSystemBus =
@@ -188,7 +188,7 @@ void RunTest(bool chrome_replies, bool chrome_alive) {
g_main_loop_run(loop);
g_main_loop_unref(loop);
}
-} // namespace {}
+} // namespace
TEST(ChromeBrowserProxyResolverTest, SuccessTest) {
RunTest(true, true);