summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/proxy/single_threaded_proxy_resolver.cc8
-rw-r--r--net/tools/hresolv/hresolv.cc5
2 files changed, 8 insertions, 5 deletions
diff --git a/net/proxy/single_threaded_proxy_resolver.cc b/net/proxy/single_threaded_proxy_resolver.cc
index 81e3f1b..4009e2a 100644
--- a/net/proxy/single_threaded_proxy_resolver.cc
+++ b/net/proxy/single_threaded_proxy_resolver.cc
@@ -1,9 +1,10 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "net/proxy/single_threaded_proxy_resolver.h"
+#include "base/message_loop.h"
#include "base/thread.h"
#include "net/base/net_log.h"
#include "net/base/net_errors.h"
@@ -23,7 +24,7 @@ class PurgeMemoryTask : public base::RefCountedThreadSafe<PurgeMemoryTask> {
ProxyResolver* resolver_;
};
-}
+} // namespace
// SingleThreadedProxyResolver::SetPacScriptTask ------------------------------
@@ -240,7 +241,8 @@ int SingleThreadedProxyResolver::GetProxyForURL(const GURL& url,
job->Start();
} else {
// Otherwise the job will get started eventually by ProcessPendingJobs().
- job->net_log()->BeginEvent(NetLog::TYPE_WAITING_FOR_SINGLE_PROXY_RESOLVER_THREAD);
+ job->net_log()->BeginEvent(
+ NetLog::TYPE_WAITING_FOR_SINGLE_PROXY_RESOLVER_THREAD);
}
// Completion will be notified through |callback|, unless the caller cancels
diff --git a/net/tools/hresolv/hresolv.cc b/net/tools/hresolv/hresolv.cc
index f092703..0adc30a 100644
--- a/net/tools/hresolv/hresolv.cc
+++ b/net/tools/hresolv/hresolv.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -27,6 +27,7 @@
#include "base/condition_variable.h"
#include "base/file_path.h"
#include "base/file_util.h"
+#include "base/message_loop.h"
#include "base/string_util.h"
#include "base/thread.h"
#include "base/time.h"
@@ -185,7 +186,7 @@ class DelayedResolve : public base::RefCounted<DelayedResolve> {
invoker_(invoker),
ALLOW_THIS_IN_INITIALIZER_LIST(
io_callback_(this, &DelayedResolve::OnResolveComplete)) {
- }
+ }
void Start() {
net::CompletionCallback* callback = (is_async_) ? &io_callback_ : NULL;