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

Side by Side Diff: chrome/browser/profiles/profile_browsertest.cc

Issue 17127002: Correctly integrate StoragePartition into TestingProfile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix InstantNTP test. 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/browser/profiles/profile.h" 5 #include "chrome/browser/profiles/profile.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/files/scoped_temp_dir.h" 8 #include "base/files/scoped_temp_dir.h"
9 #include "base/platform_file.h" 9 #include "base/platform_file.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 ProfileImpl::create_readme_delay_ms = 0; 179 ProfileImpl::create_readme_delay_ms = 0;
180 180
181 scoped_ptr<Profile> profile(Profile::CreateProfile( 181 scoped_ptr<Profile> profile(Profile::CreateProfile(
182 temp_dir.path(), &delegate, Profile::CREATE_MODE_SYNCHRONOUS)); 182 temp_dir.path(), &delegate, Profile::CREATE_MODE_SYNCHRONOUS));
183 ASSERT_TRUE(profile.get()); 183 ASSERT_TRUE(profile.get());
184 184
185 // Delete the Profile instance and run pending tasks (this includes the task 185 // Delete the Profile instance and run pending tasks (this includes the task
186 // for README creation). 186 // for README creation).
187 profile.reset(); 187 profile.reset();
188 content::RunAllPendingInMessageLoop(); 188 content::RunAllPendingInMessageLoop();
189 content::RunAllPendingInMessageLoop(content::BrowserThread::DB);
189 content::RunAllPendingInMessageLoop(content::BrowserThread::FILE); 190 content::RunAllPendingInMessageLoop(content::BrowserThread::FILE);
190 } 191 }
191 192
192 // Test that repeated setting of exit type is handled correctly. 193 // Test that repeated setting of exit type is handled correctly.
193 #if defined(OS_WIN) 194 #if defined(OS_WIN)
194 // Flaky on Windows: http://crbug.com/163713 195 // Flaky on Windows: http://crbug.com/163713
195 #define MAYBE_ExitType DISABLED_ExitType 196 #define MAYBE_ExitType DISABLED_ExitType
196 #else 197 #else
197 #define MAYBE_ExitType ExitType 198 #define MAYBE_ExitType ExitType
198 #endif 199 #endif
(...skipping 27 matching lines...) Expand all
226 std::string final_value(prefs->GetString(prefs::kSessionExitType)); 227 std::string final_value(prefs->GetString(prefs::kSessionExitType));
227 EXPECT_EQ(crash_value, final_value); 228 EXPECT_EQ(crash_value, final_value);
228 229
229 // This test runs fast enough that the WebDataService may still be 230 // This test runs fast enough that the WebDataService may still be
230 // initializing (which uses the temp directory) when the test 231 // initializing (which uses the temp directory) when the test
231 // ends. Give it a chance to complete. 232 // ends. Give it a chance to complete.
232 profile.reset(); 233 profile.reset();
233 content::RunAllPendingInMessageLoop(); 234 content::RunAllPendingInMessageLoop();
234 content::RunAllPendingInMessageLoop(content::BrowserThread::DB); 235 content::RunAllPendingInMessageLoop(content::BrowserThread::DB);
235 } 236 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/off_the_record_profile_impl_unittest.cc ('k') | chrome/browser/profiles/profile_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698