OLD | NEW |
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/platform_file.h" | 8 #include "base/platform_file.h" |
9 #include "base/scoped_temp_dir.h" | 9 #include "base/scoped_temp_dir.h" |
10 #include "base/version.h" | 10 #include "base/version.h" |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 | 121 |
122 // Wait for the profile to be created. | 122 // Wait for the profile to be created. |
123 content::WindowedNotificationObserver observer( | 123 content::WindowedNotificationObserver observer( |
124 chrome::NOTIFICATION_PROFILE_CREATED, | 124 chrome::NOTIFICATION_PROFILE_CREATED, |
125 content::Source<Profile>(profile.get())); | 125 content::Source<Profile>(profile.get())); |
126 observer.Wait(); | 126 observer.Wait(); |
127 CheckChromeVersion(profile.get(), false); | 127 CheckChromeVersion(profile.get(), false); |
128 } | 128 } |
129 | 129 |
130 // Test that a README file is created for profiles that didn't have it. | 130 // Test that a README file is created for profiles that didn't have it. |
| 131 // Flaky: http://crbug.com/140882 |
131 IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, DISABLED_ProfileReadmeCreated) { | 132 IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, DISABLED_ProfileReadmeCreated) { |
132 ScopedTempDir temp_dir; | 133 ScopedTempDir temp_dir; |
133 ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); | 134 ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); |
134 | 135 |
135 MockProfileDelegate delegate; | 136 MockProfileDelegate delegate; |
136 EXPECT_CALL(delegate, OnProfileCreated(testing::NotNull(), true, true)); | 137 EXPECT_CALL(delegate, OnProfileCreated(testing::NotNull(), true, true)); |
137 | 138 |
138 // No delay before README creation. | 139 // No delay before README creation. |
139 ProfileImpl::create_readme_delay_ms = 0; | 140 ProfileImpl::create_readme_delay_ms = 0; |
140 | 141 |
(...skipping 28 matching lines...) Expand all Loading... |
169 scoped_ptr<Profile> profile(Profile::CreateProfile( | 170 scoped_ptr<Profile> profile(Profile::CreateProfile( |
170 temp_dir.path(), &delegate, Profile::CREATE_MODE_SYNCHRONOUS)); | 171 temp_dir.path(), &delegate, Profile::CREATE_MODE_SYNCHRONOUS)); |
171 ASSERT_TRUE(profile.get()); | 172 ASSERT_TRUE(profile.get()); |
172 | 173 |
173 // Delete the Profile instance and run pending tasks (this includes the task | 174 // Delete the Profile instance and run pending tasks (this includes the task |
174 // for README creation). | 175 // for README creation). |
175 profile.reset(); | 176 profile.reset(); |
176 content::RunAllPendingInMessageLoop(); | 177 content::RunAllPendingInMessageLoop(); |
177 content::RunAllPendingInMessageLoop(content::BrowserThread::FILE); | 178 content::RunAllPendingInMessageLoop(content::BrowserThread::FILE); |
178 } | 179 } |
OLD | NEW |