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

Unified Diff: chrome/browser/extensions/test_extension_system.cc

Issue 493633003: Browser changes for wiring up RequestContentScript API to shared memory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix nit: Inline methods in unit tests Created 6 years, 4 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/test_extension_system.h ('k') | chrome/browser/extensions/user_script_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/test_extension_system.cc
diff --git a/chrome/browser/extensions/test_extension_system.cc b/chrome/browser/extensions/test_extension_system.cc
index b1cbb8723755597b8e89d66291b9b7d4a41e4998..57f7496efa653bfd70f2c67c1506953d1de46719 100644
--- a/chrome/browser/extensions/test_extension_system.cc
+++ b/chrome/browser/extensions/test_extension_system.cc
@@ -7,6 +7,7 @@
#include "base/command_line.h"
#include "base/prefs/pref_service.h"
#include "chrome/browser/extensions/blacklist.h"
+#include "chrome/browser/extensions/declarative_user_script_master.h"
#include "chrome/browser/extensions/error_console/error_console.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/install_verifier.h"
@@ -196,7 +197,22 @@ scoped_ptr<ExtensionSet> TestExtensionSystem::GetDependentExtensions(
DeclarativeUserScriptMaster*
TestExtensionSystem::GetDeclarativeUserScriptMasterByExtension(
const ExtensionId& extension_id) {
- return NULL;
+ DCHECK(ready().is_signaled());
+ DeclarativeUserScriptMaster* master = NULL;
+ for (ScopedVector<DeclarativeUserScriptMaster>::iterator it =
+ declarative_user_script_masters_.begin();
+ it != declarative_user_script_masters_.end();
+ ++it) {
+ if ((*it)->extension_id() == extension_id) {
+ master = *it;
+ break;
+ }
+ }
+ if (!master) {
+ master = new DeclarativeUserScriptMaster(profile_, extension_id);
+ declarative_user_script_masters_.push_back(master);
+ }
+ return master;
}
// static
« no previous file with comments | « chrome/browser/extensions/test_extension_system.h ('k') | chrome/browser/extensions/user_script_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698