| 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 "base/json/json_file_value_serializer.h" | 5 #include "base/json/json_file_value_serializer.h" |
| 6 #include "base/macros.h" | 6 #include "base/macros.h" |
| 7 #include "base/memory/ptr_util.h" |
| 7 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 8 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 9 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| 10 #include "base/values.h" | 11 #include "base/values.h" |
| 11 #include "build/build_config.h" | 12 #include "build/build_config.h" |
| 12 #include "chrome/browser/extensions/extension_icon_manager.h" | 13 #include "chrome/browser/extensions/extension_icon_manager.h" |
| 13 #include "chrome/common/chrome_paths.h" | 14 #include "chrome/common/chrome_paths.h" |
| 14 #include "chrome/test/base/testing_profile.h" | 15 #include "chrome/test/base/testing_profile.h" |
| 15 #include "components/crx_file/id_util.h" | 16 #include "components/crx_file/id_util.h" |
| 16 #include "content/public/test/test_browser_thread.h" | 17 #include "content/public/test/test_browser_thread.h" |
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 268 if (gfx::kFaviconSize * scale > kMaxIconSizeInManifest) | 269 if (gfx::kFaviconSize * scale > kMaxIconSizeInManifest) |
| 269 EXPECT_FALSE(has_representation); | 270 EXPECT_FALSE(has_representation); |
| 270 else | 271 else |
| 271 EXPECT_EQ(ui::IsSupportedScale(scale), has_representation); | 272 EXPECT_EQ(ui::IsSupportedScale(scale), has_representation); |
| 272 } | 273 } |
| 273 } | 274 } |
| 274 } | 275 } |
| 275 | 276 |
| 276 } // namespace | 277 } // namespace |
| 277 } // namespace extensions | 278 } // namespace extensions |
| OLD | NEW |