Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(304)

Side by Side Diff: chrome/browser/extensions/updater/extension_updater_unittest.cc

Issue 709813004: Remove the deprecated function ExtensionService::extensions(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed thestig@'s comments. Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <list> 5 #include <list>
6 #include <map> 6 #include <map>
7 #include <set> 7 #include <set>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 ~ServiceForManifestTests() override {} 450 ~ServiceForManifestTests() override {}
451 451
452 const Extension* GetExtensionById(const std::string& id, 452 const Extension* GetExtensionById(const std::string& id,
453 bool include_disabled) const override { 453 bool include_disabled) const override {
454 const Extension* result = registry_->enabled_extensions().GetByID(id); 454 const Extension* result = registry_->enabled_extensions().GetByID(id);
455 if (result || !include_disabled) 455 if (result || !include_disabled)
456 return result; 456 return result;
457 return registry_->disabled_extensions().GetByID(id); 457 return registry_->disabled_extensions().GetByID(id);
458 } 458 }
459 459
460 const ExtensionSet* extensions() const override {
461 return &registry_->enabled_extensions();
462 }
463
464 PendingExtensionManager* pending_extension_manager() override { 460 PendingExtensionManager* pending_extension_manager() override {
465 return &pending_extension_manager_; 461 return &pending_extension_manager_;
466 } 462 }
467 463
468 const Extension* GetPendingExtensionUpdate( 464 const Extension* GetPendingExtensionUpdate(
469 const std::string& id) const override { 465 const std::string& id) const override {
470 return NULL; 466 return NULL;
471 } 467 }
472 468
473 bool IsExtensionEnabled(const std::string& id) const override { 469 bool IsExtensionEnabled(const std::string& id) const override {
(...skipping 1785 matching lines...) Expand 10 before | Expand all | Expand 10 after
2259 // -prodversionmin (shouldn't update if browser version too old) 2255 // -prodversionmin (shouldn't update if browser version too old)
2260 // -manifests & updates arriving out of order / interleaved 2256 // -manifests & updates arriving out of order / interleaved
2261 // -malformed update url (empty, file://, has query, has a # fragment, etc.) 2257 // -malformed update url (empty, file://, has query, has a # fragment, etc.)
2262 // -An extension gets uninstalled while updates are in progress (so it doesn't 2258 // -An extension gets uninstalled while updates are in progress (so it doesn't
2263 // "come back from the dead") 2259 // "come back from the dead")
2264 // -An extension gets manually updated to v3 while we're downloading v2 (ie 2260 // -An extension gets manually updated to v3 while we're downloading v2 (ie
2265 // you don't get downgraded accidentally) 2261 // you don't get downgraded accidentally)
2266 // -An update manifest mentions multiple updates 2262 // -An update manifest mentions multiple updates
2267 2263
2268 } // namespace extensions 2264 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/test_extension_service.cc ('k') | chrome/browser/extensions/user_script_listener_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698