summaryrefslogtreecommitdiffstats
path: root/net/proxy
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-14 19:03:16 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-14 19:03:16 +0000
commit542cbb692992cb4b8035375396a6b2231c641fc4 (patch)
tree6dd9e0d32c71a0f4a0be9abef010ac8cb1ca0f0b /net/proxy
parentbcf6342dfef840eec089400ded252daacab0c89e (diff)
downloadchromium_src-542cbb692992cb4b8035375396a6b2231c641fc4.zip
chromium_src-542cbb692992cb4b8035375396a6b2231c641fc4.tar.gz
chromium_src-542cbb692992cb4b8035375396a6b2231c641fc4.tar.bz2
Change the files in base and net to include foundation_util.h
instead of mac_util.h. R=rohitrao@chromium.org,mark@chromium.org BUG=none TEST=none Review URL: http://codereview.chromium.org/7145016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89040 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
-rw-r--r--net/proxy/proxy_resolver_mac.cc5
-rw-r--r--net/proxy/proxy_server_mac.cc4
2 files changed, 5 insertions, 4 deletions
diff --git a/net/proxy/proxy_resolver_mac.cc b/net/proxy/proxy_resolver_mac.cc
index 31d9b61..5566e3f 100644
--- a/net/proxy/proxy_resolver_mac.cc
+++ b/net/proxy/proxy_resolver_mac.cc
@@ -1,13 +1,14 @@
-// Copyright (c) 2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/proxy_resolver_mac.h"
#include <CoreFoundation/CoreFoundation.h>
+#include <CoreServices/CoreServices.h>
#include "base/logging.h"
-#include "base/mac/mac_util.h"
+#include "base/mac/foundation_util.h"
#include "base/mac/scoped_cftyperef.h"
#include "base/string_util.h"
#include "base/sys_string_conversions.h"
diff --git a/net/proxy/proxy_server_mac.cc b/net/proxy/proxy_server_mac.cc
index 566d25e..4df37a4 100644
--- a/net/proxy/proxy_server_mac.cc
+++ b/net/proxy/proxy_server_mac.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -9,7 +9,7 @@
#include <string>
#include "base/logging.h"
-#include "base/mac/mac_util.h"
+#include "base/mac/foundation_util.h"
#include "base/sys_string_conversions.h"
namespace net {