Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1004)

Side by Side Diff: chrome/browser/profiles/profile_manager_unittest.cc

Issue 286933002: [cros login] Split login related classes into subfolders. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix includes in new tests Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/profiles/profile_manager.cc ('k') | chrome/browser/profiles/profiles_state.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/file_util.h" 8 #include "base/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" 10 #include "base/path_service.h"
(...skipping 26 matching lines...) Expand all
37 #include "chrome/test/base/testing_profile.h" 37 #include "chrome/test/base/testing_profile.h"
38 #include "content/public/browser/notification_service.h" 38 #include "content/public/browser/notification_service.h"
39 #include "content/public/common/content_switches.h" 39 #include "content/public/common/content_switches.h"
40 #include "content/public/test/test_browser_thread_bundle.h" 40 #include "content/public/test/test_browser_thread_bundle.h"
41 #include "grit/generated_resources.h" 41 #include "grit/generated_resources.h"
42 #include "testing/gmock/include/gmock/gmock.h" 42 #include "testing/gmock/include/gmock/gmock.h"
43 #include "testing/gtest/include/gtest/gtest.h" 43 #include "testing/gtest/include/gtest/gtest.h"
44 #include "ui/base/l10n/l10n_util.h" 44 #include "ui/base/l10n/l10n_util.h"
45 45
46 #if defined(OS_CHROMEOS) 46 #if defined(OS_CHROMEOS)
47 #include "chrome/browser/chromeos/login/mock_user_manager.h" 47 #include "chrome/browser/chromeos/login/users/mock_user_manager.h"
48 #include "chrome/browser/chromeos/login/user_manager.h" 48 #include "chrome/browser/chromeos/login/users/user_manager.h"
49 #include "chrome/browser/chromeos/settings/cros_settings.h" 49 #include "chrome/browser/chromeos/settings/cros_settings.h"
50 #include "chrome/browser/chromeos/settings/device_settings_service.h" 50 #include "chrome/browser/chromeos/settings/device_settings_service.h"
51 #include "chromeos/chromeos_switches.h" 51 #include "chromeos/chromeos_switches.h"
52 #endif 52 #endif
53 53
54 using base::ASCIIToUTF16; 54 using base::ASCIIToUTF16;
55 using content::BrowserThread; 55 using content::BrowserThread;
56 56
57 namespace { 57 namespace {
58 58
(...skipping 1048 matching lines...) Expand 10 before | Expand all | Expand 10 after
1107 dest_path2.BaseName().MaybeAsASCII()); 1107 dest_path2.BaseName().MaybeAsASCII());
1108 profile_manager->ScheduleProfileForDeletion(dest_path2, 1108 profile_manager->ScheduleProfileForDeletion(dest_path2,
1109 ProfileManager::CreateCallback()); 1109 ProfileManager::CreateCallback());
1110 // Spin the message loop so that all the callbacks can finish running. 1110 // Spin the message loop so that all the callbacks can finish running.
1111 base::RunLoop().RunUntilIdle(); 1111 base::RunLoop().RunUntilIdle();
1112 1112
1113 EXPECT_EQ(dest_path3, profile_manager->GetLastUsedProfile()->GetPath()); 1113 EXPECT_EQ(dest_path3, profile_manager->GetLastUsedProfile()->GetPath());
1114 EXPECT_EQ(profile_name3, local_state->GetString(prefs::kProfileLastUsed)); 1114 EXPECT_EQ(profile_name3, local_state->GetString(prefs::kProfileLastUsed));
1115 } 1115 }
1116 #endif // !defined(OS_MACOSX) 1116 #endif // !defined(OS_MACOSX)
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_manager.cc ('k') | chrome/browser/profiles/profiles_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698