| 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 // TODO(rickcam): Bug 73183: Add unit tests for image loading | 5 // TODO(rickcam): Bug 73183: Add unit tests for image loading |
| 6 | 6 |
| 7 #include <cstdlib> | 7 #include <cstdlib> |
| 8 #include <set> | 8 #include <set> |
| 9 | 9 |
| 10 #include "chrome/browser/background/background_application_list_model.h" | 10 #include "chrome/browser/background/background_application_list_model.h" |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 service->profile())) { | 113 service->profile())) { |
| 114 return; | 114 return; |
| 115 } | 115 } |
| 116 extensions::PermissionsUpdater(service->profile()).RemovePermissions( | 116 extensions::PermissionsUpdater(service->profile()).RemovePermissions( |
| 117 extension, extension->GetActivePermissions()); | 117 extension, extension->GetActivePermissions()); |
| 118 } | 118 } |
| 119 } // namespace | 119 } // namespace |
| 120 | 120 |
| 121 // Crashes on Mac tryslaves. | 121 // Crashes on Mac tryslaves. |
| 122 // http://crbug.com/165458 | 122 // http://crbug.com/165458 |
| 123 #if defined(OS_MACOSX) | 123 #if defined(OS_MACOSX) || defined(OS_LINUX) |
| 124 #define MAYBE_ExplicitTest DISABLED_ExplicitTest | 124 #define MAYBE_ExplicitTest DISABLED_ExplicitTest |
| 125 #else | 125 #else |
| 126 #define MAYBE_ExplicitTest ExplicitTest | 126 #define MAYBE_ExplicitTest ExplicitTest |
| 127 #endif | 127 #endif |
| 128 // With minimal test logic, verifies behavior over an explicit set of | 128 // With minimal test logic, verifies behavior over an explicit set of |
| 129 // extensions, of which some are Background Apps and others are not. | 129 // extensions, of which some are Background Apps and others are not. |
| 130 TEST_F(BackgroundApplicationListModelTest, MAYBE_ExplicitTest) { | 130 TEST_F(BackgroundApplicationListModelTest, MAYBE_ExplicitTest) { |
| 131 InitializeAndLoadEmptyExtensionService(); | 131 InitializeAndLoadEmptyExtensionService(); |
| 132 ExtensionService* service = extensions::ExtensionSystem::Get(profile_.get())-> | 132 ExtensionService* service = extensions::ExtensionSystem::Get(profile_.get())-> |
| 133 extension_service(); | 133 extension_service(); |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 371 break; | 371 break; |
| 372 case 2: | 372 case 2: |
| 373 TogglePermission(service, &extensions, model.get(), &expected, &count); | 373 TogglePermission(service, &extensions, model.get(), &expected, &count); |
| 374 break; | 374 break; |
| 375 default: | 375 default: |
| 376 NOTREACHED(); | 376 NOTREACHED(); |
| 377 break; | 377 break; |
| 378 } | 378 } |
| 379 } | 379 } |
| 380 } | 380 } |
| OLD | NEW |