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

Side by Side Diff: chrome/browser/tab_contents/navigation_controller_unittest.cc

Issue 271099: Re-try r29078: Remove some deprecated file_util wstring functions. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 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
« no previous file with comments | « chrome/browser/printing/printing_layout_uitest.cc ('k') | chrome/common/chrome_plugin_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/file_util.h" 5 #include "base/file_util.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "base/stl_util-inl.h" 7 #include "base/stl_util-inl.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "chrome/browser/profile_manager.h" 9 #include "chrome/browser/profile_manager.h"
10 #include "chrome/browser/history/history.h" 10 #include "chrome/browser/history/history.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 profile()->GetHistoryService(Profile::IMPLICIT_ACCESS); 81 profile()->GetHistoryService(Profile::IMPLICIT_ACCESS);
82 if (history) { 82 if (history) {
83 history->SetOnBackendDestroyTask(new MessageLoop::QuitTask); 83 history->SetOnBackendDestroyTask(new MessageLoop::QuitTask);
84 MessageLoop::current()->Run(); 84 MessageLoop::current()->Run();
85 } 85 }
86 86
87 // Do normal cleanup before deleting the profile directory below. 87 // Do normal cleanup before deleting the profile directory below.
88 NavigationControllerTest::TearDown(); 88 NavigationControllerTest::TearDown();
89 89
90 ASSERT_TRUE(file_util::Delete(test_dir_, true)); 90 ASSERT_TRUE(file_util::Delete(test_dir_, true));
91 ASSERT_FALSE(file_util::PathExists(test_dir_)); 91 ASSERT_FALSE(file_util::PathExists(FilePath::FromWStringHack(test_dir_)));
92 } 92 }
93 93
94 // Deletes the current profile manager and creates a new one. Indirectly this 94 // Deletes the current profile manager and creates a new one. Indirectly this
95 // shuts down the history database and reopens it. 95 // shuts down the history database and reopens it.
96 void ReopenDatabase() { 96 void ReopenDatabase() {
97 session_helper_.set_service(NULL); 97 session_helper_.set_service(NULL);
98 profile()->set_session_service(NULL); 98 profile()->set_session_service(NULL);
99 99
100 SessionService* service = new SessionService(profile()); 100 SessionService* service = new SessionService(profile());
101 profile()->set_session_service(service); 101 profile()->set_session_service(service);
(...skipping 1406 matching lines...) Expand 10 before | Expand all | Expand 10 after
1508 TabNavigation nav(0, url0, GURL(), string16(), 1508 TabNavigation nav(0, url0, GURL(), string16(),
1509 webkit_glue::CreateHistoryStateForURL(url0), 1509 webkit_glue::CreateHistoryStateForURL(url0),
1510 PageTransition::LINK); 1510 PageTransition::LINK);
1511 session_helper_.AssertNavigationEquals(nav, 1511 session_helper_.AssertNavigationEquals(nav,
1512 windows_[0]->tabs[0]->navigations[0]); 1512 windows_[0]->tabs[0]->navigations[0]);
1513 nav.set_url(url2); 1513 nav.set_url(url2);
1514 session_helper_.AssertNavigationEquals(nav, 1514 session_helper_.AssertNavigationEquals(nav,
1515 windows_[0]->tabs[0]->navigations[1]); 1515 windows_[0]->tabs[0]->navigations[1]);
1516 } 1516 }
1517 */ 1517 */
OLDNEW
« no previous file with comments | « chrome/browser/printing/printing_layout_uitest.cc ('k') | chrome/common/chrome_plugin_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698