| 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 <memory> | 5 #include <memory> |
| 6 #include <string> | 6 #include <string> |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 483 active_tab_permission_granter()->GrantIfRequested(another_extension.get()); | 483 active_tab_permission_granter()->GrantIfRequested(another_extension.get()); |
| 484 base::RunLoop().RunUntilIdle(); | 484 base::RunLoop().RunUntilIdle(); |
| 485 EXPECT_TRUE(IsBlocked(another_extension, google)); | 485 EXPECT_TRUE(IsBlocked(another_extension, google)); |
| 486 active_tab_permission_granter()->GrantIfRequested(another_extension.get()); | 486 active_tab_permission_granter()->GrantIfRequested(another_extension.get()); |
| 487 base::RunLoop().RunUntilIdle(); | 487 base::RunLoop().RunUntilIdle(); |
| 488 EXPECT_TRUE(IsBlocked(another_extension, google)); | 488 EXPECT_TRUE(IsBlocked(another_extension, google)); |
| 489 } | 489 } |
| 490 | 490 |
| 491 // Cleanup. | 491 // Cleanup. |
| 492 chromeos::WallpaperManager::Shutdown(); | 492 chromeos::WallpaperManager::Shutdown(); |
| 493 free(ActiveTabPermissionGranter::SetPlatformDelegate(nullptr)); | 493 delete ActiveTabPermissionGranter::SetPlatformDelegate(nullptr); |
| 494 } | 494 } |
| 495 #endif | 495 #endif // defined(OS_CHROMEOS) |
| 496 | 496 |
| 497 } // namespace | 497 } // namespace |
| 498 } // namespace extensions | 498 } // namespace extensions |
| OLD | NEW |