summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorerikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-15 21:29:06 +0000
committererikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-15 21:29:06 +0000
commitaa84a7e93e2254b4607e30119d63c50ac0cced22 (patch)
tree2dfb7d0356d74a19f797216318641c9835736417 /chrome_frame
parent103e385c881d7f83bd0aeecdcf618a746f47e9be (diff)
downloadchromium_src-aa84a7e93e2254b4607e30119d63c50ac0cced22.zip
chromium_src-aa84a7e93e2254b4607e30119d63c50ac0cced22.tar.gz
chromium_src-aa84a7e93e2254b4607e30119d63c50ac0cced22.tar.bz2
Update net/base/cookie_*.h includes to net/cookies/cookie_*.h .
Once complete, forwarding headers will be removed from net/base/ . TEST=none R=willchan Review URL: http://codereview.chromium.org/9703062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126999 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/chrome_frame_activex_base.h4
-rw-r--r--chrome_frame/test/test_server_test.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome_frame/chrome_frame_activex_base.h b/chrome_frame/chrome_frame_activex_base.h
index 7e83727..fad7290 100644
--- a/chrome_frame/chrome_frame_activex_base.h
+++ b/chrome_frame/chrome_frame_activex_base.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -36,7 +36,7 @@
#include "chrome_frame/urlmon_url_request_private.h"
#include "chrome_frame/utils.h"
#include "grit/generated_resources.h"
-#include "net/base/cookie_monster.h"
+#include "net/cookies/cookie_monster.h"
// Connection point class to support firing IChromeFrameEvents (dispinterface).
template<class T>
diff --git a/chrome_frame/test/test_server_test.cc b/chrome_frame/test/test_server_test.cc
index 504a3df..3efe04c 100644
--- a/chrome_frame/test/test_server_test.cc
+++ b/chrome_frame/test/test_server_test.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -10,8 +10,8 @@
#include "base/path_service.h"
#include "base/win/scoped_handle.h"
#include "chrome_frame/test/test_server.h"
-#include "net/base/cookie_monster.h"
#include "net/base/host_resolver_proc.h"
+#include "net/cookies/cookie_monster.h"
#include "net/disk_cache/disk_cache.h"
#include "net/http/http_auth_handler_factory.h"
#include "net/http/http_cache.h"