| 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 #include <stddef.h> |
| 7 | 7 |
| 8 #include "base/base_paths.h" | 8 #include "base/base_paths.h" |
| 9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
| 10 #include "base/location.h" | 10 #include "base/location.h" |
| 11 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
| 12 #include "base/path_service.h" | 12 #include "base/path_service.h" |
| 13 #include "base/strings/string16.h" | 13 #include "base/strings/string16.h" |
| 14 #include "base/test/scoped_path_override.h" | 14 #include "base/test/scoped_path_override.h" |
| 15 #include "base/test/test_shortcut_win.h" | 15 #include "base/test/test_shortcut_win.h" |
| 16 #include "base/win/shortcut.h" | 16 #include "base/win/shortcut.h" |
| 17 #include "chrome/browser/profiles/profile.h" | 17 #include "chrome/browser/profiles/profile.h" |
| 18 #include "chrome/browser/profiles/profile_info_cache.h" |
| 18 #include "chrome/browser/profiles/profile_manager.h" | 19 #include "chrome/browser/profiles/profile_manager.h" |
| 19 #include "chrome/browser/profiles/profile_shortcut_manager.h" | 20 #include "chrome/browser/profiles/profile_shortcut_manager.h" |
| 20 #include "chrome/browser/profiles/profile_shortcut_manager_win.h" | 21 #include "chrome/browser/profiles/profile_shortcut_manager_win.h" |
| 21 #include "chrome/browser/shell_integration.h" | 22 #include "chrome/browser/shell_integration.h" |
| 22 #include "chrome/grit/chromium_strings.h" | 23 #include "chrome/grit/chromium_strings.h" |
| 23 #include "chrome/installer/util/browser_distribution.h" | 24 #include "chrome/installer/util/browser_distribution.h" |
| 24 #include "chrome/installer/util/product.h" | 25 #include "chrome/installer/util/product.h" |
| 25 #include "chrome/installer/util/shell_util.h" | 26 #include "chrome/installer/util/shell_util.h" |
| 26 #include "chrome/test/base/testing_browser_process.h" | 27 #include "chrome/test/base/testing_browser_process.h" |
| 27 #include "chrome/test/base/testing_profile.h" | 28 #include "chrome/test/base/testing_profile.h" |
| (...skipping 843 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 871 EXPECT_NE(unbadged_icon_1, new_badged_icon_1); | 872 EXPECT_NE(unbadged_icon_1, new_badged_icon_1); |
| 872 | 873 |
| 873 // Ensure the icon doesn't change on avatar change without 2 profiles. | 874 // Ensure the icon doesn't change on avatar change without 2 profiles. |
| 874 profile_info_cache_->SetAvatarIconOfProfileAtIndex(profile_index_1, 1); | 875 profile_info_cache_->SetAvatarIconOfProfileAtIndex(profile_index_1, 1); |
| 875 RunPendingTasks(); | 876 RunPendingTasks(); |
| 876 | 877 |
| 877 std::string unbadged_icon_1_a; | 878 std::string unbadged_icon_1_a; |
| 878 EXPECT_TRUE(base::ReadFileToString(icon_path_1, &unbadged_icon_1_a)); | 879 EXPECT_TRUE(base::ReadFileToString(icon_path_1, &unbadged_icon_1_a)); |
| 879 EXPECT_EQ(unbadged_icon_1, unbadged_icon_1_a); | 880 EXPECT_EQ(unbadged_icon_1, unbadged_icon_1_a); |
| 880 } | 881 } |
| OLD | NEW |