| 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 <string> | 5 #include <string> |
| 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/path_service.h" | |
| 11 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| 12 #include "base/strings/utf_string_conversions.h" | 11 #include "base/strings/utf_string_conversions.h" |
| 13 #include "base/values.h" | 12 #include "base/values.h" |
| 14 #include "build/build_config.h" | 13 #include "build/build_config.h" |
| 15 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 14 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
| 16 #include "chrome/browser/browser_process.h" | 15 #include "chrome/browser/browser_process.h" |
| 17 #include "chrome/browser/chrome_notification_types.h" | 16 #include "chrome/browser/chrome_notification_types.h" |
| 18 #include "chrome/browser/chromeos/settings/cros_settings.h" | 17 #include "chrome/browser/chromeos/settings/cros_settings.h" |
| 19 #include "chrome/browser/history/history_service.h" | 18 #include "chrome/browser/history/history_service.h" |
| 20 #include "chrome/browser/history/history_service_factory.h" | 19 #include "chrome/browser/history/history_service_factory.h" |
| (...skipping 1267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1288 dest_path2.BaseName().MaybeAsASCII()); | 1287 dest_path2.BaseName().MaybeAsASCII()); |
| 1289 profile_manager->ScheduleProfileForDeletion(dest_path2, | 1288 profile_manager->ScheduleProfileForDeletion(dest_path2, |
| 1290 ProfileManager::CreateCallback()); | 1289 ProfileManager::CreateCallback()); |
| 1291 // Spin the message loop so that all the callbacks can finish running. | 1290 // Spin the message loop so that all the callbacks can finish running. |
| 1292 base::RunLoop().RunUntilIdle(); | 1291 base::RunLoop().RunUntilIdle(); |
| 1293 | 1292 |
| 1294 EXPECT_EQ(dest_path3, profile_manager->GetLastUsedProfile()->GetPath()); | 1293 EXPECT_EQ(dest_path3, profile_manager->GetLastUsedProfile()->GetPath()); |
| 1295 EXPECT_EQ(profile_name3, local_state->GetString(prefs::kProfileLastUsed)); | 1294 EXPECT_EQ(profile_name3, local_state->GetString(prefs::kProfileLastUsed)); |
| 1296 } | 1295 } |
| 1297 #endif // !defined(OS_MACOSX) | 1296 #endif // !defined(OS_MACOSX) |
| OLD | NEW |