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

Side by Side Diff: content/browser/web_contents/navigation_controller_impl_unittest.cc

Issue 18584011: Rename base::Delete to base::DeleteFile (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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 3756 matching lines...) Expand 10 before | Expand all | Expand 10 after
3767 HistoryService* history = HistoryServiceFactory::GetForProfiles( 3767 HistoryService* history = HistoryServiceFactory::GetForProfiles(
3768 profile(), Profile::IMPLICIT_ACCESS); 3768 profile(), Profile::IMPLICIT_ACCESS);
3769 if (history) { 3769 if (history) {
3770 history->SetOnBackendDestroyTask(base::MessageLoop::QuitClosure()); 3770 history->SetOnBackendDestroyTask(base::MessageLoop::QuitClosure());
3771 base::MessageLoop::current()->Run(); 3771 base::MessageLoop::current()->Run();
3772 } 3772 }
3773 3773
3774 // Do normal cleanup before deleting the profile directory below. 3774 // Do normal cleanup before deleting the profile directory below.
3775 NavigationControllerTest::TearDown(); 3775 NavigationControllerTest::TearDown();
3776 3776
3777 ASSERT_TRUE(base::Delete(test_dir_, true)); 3777 ASSERT_TRUE(base::DeleteFile(test_dir_, true));
3778 ASSERT_FALSE(base::PathExists(test_dir_)); 3778 ASSERT_FALSE(base::PathExists(test_dir_));
3779 } 3779 }
3780 3780
3781 // Deletes the current profile manager and creates a new one. Indirectly this 3781 // Deletes the current profile manager and creates a new one. Indirectly this
3782 // shuts down the history database and reopens it. 3782 // shuts down the history database and reopens it.
3783 void ReopenDatabase() { 3783 void ReopenDatabase() {
3784 session_helper_.set_service(NULL); 3784 session_helper_.set_service(NULL);
3785 SessionServiceFactory::SetForTestProfile(profile(), NULL); 3785 SessionServiceFactory::SetForTestProfile(profile(), NULL);
3786 3786
3787 SessionService* service = new SessionService(profile()); 3787 SessionService* service = new SessionService(profile());
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
3891 PAGE_TRANSITION_LINK); 3891 PAGE_TRANSITION_LINK);
3892 session_helper_.AssertNavigationEquals(nav, 3892 session_helper_.AssertNavigationEquals(nav,
3893 windows_[0]->tabs[0]->navigations[0]); 3893 windows_[0]->tabs[0]->navigations[0]);
3894 nav.set_url(url2); 3894 nav.set_url(url2);
3895 session_helper_.AssertNavigationEquals(nav, 3895 session_helper_.AssertNavigationEquals(nav,
3896 windows_[0]->tabs[0]->navigations[1]); 3896 windows_[0]->tabs[0]->navigations[1]);
3897 } 3897 }
3898 */ 3898 */
3899 3899
3900 } // namespace content 3900 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/storage_partition_impl_map.cc ('k') | content/browser/web_contents/web_contents_drag_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698