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 <objbase.h> // For CoInitialize(). | 5 #include <objbase.h> // For CoInitialize(). |
| 6 #include <stddef.h> |
6 | 7 |
7 #include "base/base_paths.h" | 8 #include "base/base_paths.h" |
8 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
9 #include "base/location.h" | 10 #include "base/location.h" |
10 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
11 #include "base/path_service.h" | 12 #include "base/path_service.h" |
12 #include "base/strings/string16.h" | 13 #include "base/strings/string16.h" |
13 #include "base/test/scoped_path_override.h" | 14 #include "base/test/scoped_path_override.h" |
14 #include "base/test/test_shortcut_win.h" | 15 #include "base/test/test_shortcut_win.h" |
15 #include "base/win/shortcut.h" | 16 #include "base/win/shortcut.h" |
(...skipping 854 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
870 EXPECT_NE(unbadged_icon_1, new_badged_icon_1); | 871 EXPECT_NE(unbadged_icon_1, new_badged_icon_1); |
871 | 872 |
872 // Ensure the icon doesn't change on avatar change without 2 profiles. | 873 // Ensure the icon doesn't change on avatar change without 2 profiles. |
873 profile_info_cache_->SetAvatarIconOfProfileAtIndex(profile_index_1, 1); | 874 profile_info_cache_->SetAvatarIconOfProfileAtIndex(profile_index_1, 1); |
874 RunPendingTasks(); | 875 RunPendingTasks(); |
875 | 876 |
876 std::string unbadged_icon_1_a; | 877 std::string unbadged_icon_1_a; |
877 EXPECT_TRUE(base::ReadFileToString(icon_path_1, &unbadged_icon_1_a)); | 878 EXPECT_TRUE(base::ReadFileToString(icon_path_1, &unbadged_icon_1_a)); |
878 EXPECT_EQ(unbadged_icon_1, unbadged_icon_1_a); | 879 EXPECT_EQ(unbadged_icon_1, unbadged_icon_1_a); |
879 } | 880 } |
OLD | NEW |