| Index: chrome/browser/app_controller_mac_browsertest.mm
|
| diff --git a/chrome/browser/app_controller_mac_browsertest.mm b/chrome/browser/app_controller_mac_browsertest.mm
|
| index c0b4161b04087701b4f1a20b12f2992cf3a1ef43..1d46c37cd8c7cb4b481cfc28dc2643853904a06f 100644
|
| --- a/chrome/browser/app_controller_mac_browsertest.mm
|
| +++ b/chrome/browser/app_controller_mac_browsertest.mm
|
| @@ -16,6 +16,7 @@
|
| #include "base/run_loop.h"
|
| #include "base/strings/sys_string_conversions.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| +#include "base/threading/thread_restrictions.h"
|
| #include "chrome/app/chrome_command_ids.h"
|
| #import "chrome/browser/app_controller_mac.h"
|
| #include "chrome/browser/apps/app_browsertest_util.h"
|
| @@ -257,6 +258,7 @@ IN_PROC_BROWSER_TEST_F(AppControllerNewProfileManagementBrowserTest,
|
| base::scoped_nsobject<AppController> ac([[AppController alloc] init]);
|
|
|
| // Lock the active profile.
|
| + base::ThreadRestrictions::ScopedAllowIO allow_io;
|
| Profile* profile = [ac lastProfile];
|
| ProfileAttributesEntry* entry;
|
| ASSERT_TRUE(g_browser_process->profile_manager()->
|
| @@ -292,6 +294,7 @@ IN_PROC_BROWSER_TEST_F(AppControllerNewProfileManagementBrowserTest,
|
|
|
| base::scoped_nsobject<AppController> ac([[AppController alloc] init]);
|
|
|
| + base::ThreadRestrictions::ScopedAllowIO allow_io;
|
| Profile* profile = [ac lastProfile];
|
| EXPECT_EQ(ProfileManager::GetGuestProfilePath(), profile->GetPath());
|
| EXPECT_TRUE(profile->IsGuestSession());
|
| @@ -326,6 +329,7 @@ IN_PROC_BROWSER_TEST_F(AppControllerNewProfileManagementBrowserTest,
|
| // Prohibiting guest mode forces the user manager flow for About Chrome.
|
| local_state->SetBoolean(prefs::kBrowserGuestModeEnabled, false);
|
|
|
| + base::ThreadRestrictions::ScopedAllowIO allow_io;
|
| Profile* guest_profile = [ac lastProfile];
|
| EXPECT_EQ(ProfileManager::GetGuestProfilePath(), guest_profile->GetPath());
|
| EXPECT_TRUE(guest_profile->IsGuestSession());
|
| @@ -538,6 +542,7 @@ IN_PROC_BROWSER_TEST_F(AppControllerMainMenuBrowserTest,
|
| BookmarkModelFactory::GetForBrowserContext(profile1));
|
|
|
| // Create profile 2.
|
| + base::ThreadRestrictions::ScopedAllowIO allow_io;
|
| base::FilePath path2 = profile_manager->GenerateNextProfileDirectoryPath();
|
| Profile* profile2 =
|
| Profile::CreateProfile(path2, NULL, Profile::CREATE_MODE_SYNCHRONOUS);
|
|
|