Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Side by Side Diff: chrome_frame/test/chrome_frame_test_utils.cc

Issue 16950028: Move file_util::Delete to the base namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome_frame/test/chrome_frame_test_utils.h" 5 #include "chrome_frame/test/chrome_frame_test_utils.h"
6 6
7 #include <atlapp.h> 7 #include <atlapp.h>
8 #include <atlmisc.h> 8 #include <atlmisc.h>
9 #include <iepmapi.h> 9 #include <iepmapi.h>
10 #include <sddl.h> 10 #include <sddl.h>
(...skipping 684 matching lines...) Expand 10 before | Expand all | Expand 10 after
695 } 695 }
696 696
697 void ClearIESessionHistory() { 697 void ClearIESessionHistory() {
698 base::FilePath session_history_path; 698 base::FilePath session_history_path;
699 if (!PathService::Get(base::DIR_LOCAL_APP_DATA, &session_history_path)) 699 if (!PathService::Get(base::DIR_LOCAL_APP_DATA, &session_history_path))
700 return; 700 return;
701 701
702 session_history_path = session_history_path.AppendASCII("Microsoft"); 702 session_history_path = session_history_path.AppendASCII("Microsoft");
703 session_history_path = session_history_path.AppendASCII("Internet Explorer"); 703 session_history_path = session_history_path.AppendASCII("Internet Explorer");
704 session_history_path = session_history_path.AppendASCII("Recovery"); 704 session_history_path = session_history_path.AppendASCII("Recovery");
705 file_util::Delete(session_history_path, true); 705 base::Delete(session_history_path, true);
706 } 706 }
707 707
708 std::string GetLocalIPv4Address() { 708 std::string GetLocalIPv4Address() {
709 std::string address; 709 std::string address;
710 net::NetworkInterfaceList nic_list; 710 net::NetworkInterfaceList nic_list;
711 711
712 if (!net::GetNetworkList(&nic_list)) { 712 if (!net::GetNetworkList(&nic_list)) {
713 LOG(ERROR) << "GetNetworkList failed to look up non-loopback adapters. " 713 LOG(ERROR) << "GetNetworkList failed to look up non-loopback adapters. "
714 << "Tests will be run over the loopback adapter, which may " 714 << "Tests will be run over the loopback adapter, which may "
715 << "result in hangs."; 715 << "result in hangs.";
(...skipping 17 matching lines...) Expand all
733 if (address.empty()) { 733 if (address.empty()) {
734 LOG(ERROR) << "Failed to find a non-loopback IP_V4 address. Tests will be " 734 LOG(ERROR) << "Failed to find a non-loopback IP_V4 address. Tests will be "
735 << "run over the loopback adapter, which may result in hangs."; 735 << "run over the loopback adapter, which may result in hangs.";
736 address.assign("127.0.0.1"); 736 address.assign("127.0.0.1");
737 } 737 }
738 738
739 return address; 739 return address;
740 } 740 }
741 741
742 } // namespace chrome_frame_test 742 } // namespace chrome_frame_test
OLDNEW
« no previous file with comments | « chrome_frame/crash_reporting/minidump_test.cc ('k') | chrome_frame/test/net/fake_external_tab.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698