Declarative content scripts: Browser-side: per-extension shared memory regions (lazily loaded)

chrome/browser/extensions/extension_startup_browsertest.cc

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..34a7c2bfd319ec29e33b8cf7e253eaf860f2c9b9 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,12 +131,12 @@ class ExtensionStartupTestBase : public InProcessBrowserTest {
     content::WindowedNotificationObserver user_scripts_observer(
         extensions::NOTIFICATION_USER_SCRIPTS_UPDATED,
         content::NotificationService::AllSources());
-    extensions::UserScriptMaster* master =
+    extensions::SharedUserScriptMaster* master =
         extensions::ExtensionSystem::Get(browser()->profile())->
-            user_script_master();
-    if (!master->ScriptsReady())
+            shared_user_script_master();
+    if (!master->scripts_ready())
       user_scripts_observer.Wait();
-    ASSERT_TRUE(master->ScriptsReady());
+    ASSERT_TRUE(master->scripts_ready());
   }
 
   void TestInjection(bool expect_css, bool expect_script) {