| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "chrome/browser/extensions/extension_service_unittest.h" | 5 #include "chrome/browser/extensions/extension_service_unittest.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 211 #if !(defined(OS_LINUX) && defined(USE_AURA) && !defined(OS_CHROMEOS)) | 211 #if !(defined(OS_LINUX) && defined(USE_AURA) && !defined(OS_CHROMEOS)) |
| 212 static void AddPattern(URLPatternSet* extent, const std::string& pattern) { | 212 static void AddPattern(URLPatternSet* extent, const std::string& pattern) { |
| 213 int schemes = URLPattern::SCHEME_ALL; | 213 int schemes = URLPattern::SCHEME_ALL; |
| 214 extent->AddPattern(URLPattern(schemes, pattern)); | 214 extent->AddPattern(URLPattern(schemes, pattern)); |
| 215 } | 215 } |
| 216 #endif | 216 #endif |
| 217 | 217 |
| 218 #if !(defined(OS_LINUX) && defined(USE_AURA) && !defined(OS_CHROMEOS)) | 218 #if !(defined(OS_LINUX) && defined(USE_AURA) && !defined(OS_CHROMEOS)) |
| 219 base::FilePath GetTemporaryFile() { | 219 base::FilePath GetTemporaryFile() { |
| 220 base::FilePath temp_file; | 220 base::FilePath temp_file; |
| 221 CHECK(file_util::CreateTemporaryFile(&temp_file)); | 221 CHECK(base::CreateTemporaryFile(&temp_file)); |
| 222 return temp_file; | 222 return temp_file; |
| 223 } | 223 } |
| 224 | 224 |
| 225 bool WaitForCountNotificationsCallback(int *count) { | 225 bool WaitForCountNotificationsCallback(int *count) { |
| 226 return --(*count) == 0; | 226 return --(*count) == 0; |
| 227 } | 227 } |
| 228 #endif // !(defined(OS_LINUX) && defined(USE_AURA) && !defined(OS_CHROMEOS)) | 228 #endif // !(defined(OS_LINUX) && defined(USE_AURA) && !defined(OS_CHROMEOS)) |
| 229 | 229 |
| 230 } // namespace | 230 } // namespace |
| 231 | 231 |
| (...skipping 6526 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6758 service_->ReconcileKnownDisabled(); | 6758 service_->ReconcileKnownDisabled(); |
| 6759 expected_extensions.insert(good2); | 6759 expected_extensions.insert(good2); |
| 6760 expected_disabled_extensions.erase(good2); | 6760 expected_disabled_extensions.erase(good2); |
| 6761 | 6761 |
| 6762 EXPECT_EQ(expected_extensions, service_->extensions()->GetIDs()); | 6762 EXPECT_EQ(expected_extensions, service_->extensions()->GetIDs()); |
| 6763 EXPECT_EQ(expected_disabled_extensions, | 6763 EXPECT_EQ(expected_disabled_extensions, |
| 6764 service_->disabled_extensions()->GetIDs()); | 6764 service_->disabled_extensions()->GetIDs()); |
| 6765 } | 6765 } |
| 6766 | 6766 |
| 6767 #endif // #if !(defined(OS_LINUX) && defined(USE_AURA) && !defined(OS_CHROMEOS)) | 6767 #endif // #if !(defined(OS_LINUX) && defined(USE_AURA) && !defined(OS_CHROMEOS)) |
| OLD | NEW |