| 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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 // (see crbug.com/88586). | 86 // (see crbug.com/88586). |
| 87 content::RunAllPendingInMessageLoop(); | 87 content::RunAllPendingInMessageLoop(); |
| 88 content::RunAllPendingInMessageLoop(content::BrowserThread::DB); | 88 content::RunAllPendingInMessageLoop(content::BrowserThread::DB); |
| 89 content::RunAllPendingInMessageLoop(content::BrowserThread::FILE); | 89 content::RunAllPendingInMessageLoop(content::BrowserThread::FILE); |
| 90 } | 90 } |
| 91 | 91 |
| 92 } // namespace | 92 } // namespace |
| 93 | 93 |
| 94 class ProfileBrowserTest : public InProcessBrowserTest { | 94 class ProfileBrowserTest : public InProcessBrowserTest { |
| 95 protected: | 95 protected: |
| 96 virtual void SetUpCommandLine(CommandLine* command_line) override { | 96 void SetUpCommandLine(CommandLine* command_line) override { |
| 97 #if defined(OS_CHROMEOS) | 97 #if defined(OS_CHROMEOS) |
| 98 command_line->AppendSwitch( | 98 command_line->AppendSwitch( |
| 99 chromeos::switches::kIgnoreUserProfileMappingForTests); | 99 chromeos::switches::kIgnoreUserProfileMappingForTests); |
| 100 #endif | 100 #endif |
| 101 } | 101 } |
| 102 | 102 |
| 103 scoped_ptr<Profile> CreateProfile( | 103 scoped_ptr<Profile> CreateProfile( |
| 104 const base::FilePath& path, | 104 const base::FilePath& path, |
| 105 Profile::Delegate* delegate, | 105 Profile::Delegate* delegate, |
| 106 Profile::CreateMode create_mode) { | 106 Profile::CreateMode create_mode) { |
| (...skipping 347 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 |