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/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/files/file_util.h" | 8 #include "base/files/file_util.h" |
9 #include "base/files/scoped_temp_dir.h" | 9 #include "base/files/scoped_temp_dir.h" |
10 #include "base/json/json_reader.h" | 10 #include "base/json/json_reader.h" |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 path, delegate, create_mode)); | 108 path, delegate, create_mode)); |
109 EXPECT_TRUE(profile.get()); | 109 EXPECT_TRUE(profile.get()); |
110 | 110 |
111 // Store the Profile's IO task runner so we can wind it down. | 111 // Store the Profile's IO task runner so we can wind it down. |
112 profile_io_task_runner_ = profile->GetIOTaskRunner(); | 112 profile_io_task_runner_ = profile->GetIOTaskRunner(); |
113 | 113 |
114 return profile.Pass(); | 114 return profile.Pass(); |
115 } | 115 } |
116 | 116 |
117 void FlushIoTaskRunnerAndSpinThreads() { | 117 void FlushIoTaskRunnerAndSpinThreads() { |
118 FlushTaskRunner(profile_io_task_runner_); | 118 FlushTaskRunner(profile_io_task_runner_.get()); |
119 SpinThreads(); | 119 SpinThreads(); |
120 } | 120 } |
121 | 121 |
122 scoped_refptr<base::SequencedTaskRunner> profile_io_task_runner_; | 122 scoped_refptr<base::SequencedTaskRunner> profile_io_task_runner_; |
123 }; | 123 }; |
124 | 124 |
125 // Test OnProfileCreate is called with is_new_profile set to true when | 125 // Test OnProfileCreate is called with is_new_profile set to true when |
126 // creating a new profile synchronously. | 126 // creating a new profile synchronously. |
127 IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, CreateNewProfileSynchronous) { | 127 IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, CreateNewProfileSynchronous) { |
128 base::ScopedTempDir temp_dir; | 128 base::ScopedTempDir temp_dir; |
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
454 } | 454 } |
455 | 455 |
456 // Release the IO thread thread. | 456 // Release the IO thread thread. |
457 unblock->Signal(); | 457 unblock->Signal(); |
458 } | 458 } |
459 | 459 |
460 ASSERT_TRUE(mis_wrote); | 460 ASSERT_TRUE(mis_wrote); |
461 } | 461 } |
462 | 462 |
463 #endif // defined(USE_X11) || defined(OS_WIN) | 463 #endif // defined(USE_X11) || defined(OS_WIN) |
OLD | NEW |