chrome/browser/extensions/extension_startup_browsertest.cc - Issue 420543002: Declarative content scripts: Browser-side: per-extension shared memory regions (lazily loaded)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 420543002: Declarative content scripts: Browser-side: per-extension shared memory regions (lazily loaded) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Refactor UserScriptMaster into UserScriptLoader, managed by SharedUserScriptMaster and DeclarativeU… 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

« chrome/browser/extensions/declarative_user_script_master.cc ('K') | « chrome/browser/extensions/extension_incognito_apitest.cc ('k') | chrome/browser/extensions/extension_system_impl.h » ('j') | chrome/browser/extensions/extension_system_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_startup_browsertest.cc

diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc

index 455545d330e2a00bde1a506eb3a0634d6ae1e9f4..0e8e2fbd43f32ae7077c64095d28c8208e5d5495 100644

--- a/chrome/browser/extensions/extension_startup_browsertest.cc

+++ b/chrome/browser/extensions/extension_startup_browsertest.cc

@@ -13,7 +13,7 @@

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/extensions/extension_util.h"

-#include "chrome/browser/extensions/user_script_master.h"

+#include "chrome/browser/extensions/shared_user_script_master.h"

#include "chrome/browser/prefs/chrome_pref_service_factory.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/browser.h"

@@ -131,9 +131,9 @@ class ExtensionStartupTestBase : public InProcessBrowserTest {

content::WindowedNotificationObserver user_scripts_observer(

extensions::NOTIFICATION_USER_SCRIPTS_UPDATED,

content::NotificationService::AllSources());

- extensions::UserScriptMaster* master =

- extensions::ExtensionSystem::Get(browser()->profile())->

- user_script_master();

+ extensions::SharedUserScriptMaster* master =

+ extensions::ExtensionSystem::Get(browser()->profile())

+ ->shared_user_script_master();

if (!master->ScriptsReady())

user_scripts_observer.Wait();

ASSERT_TRUE(master->ScriptsReady());