app_shell: Extract extension runtime data from ExtensionService

chrome/browser/automation/automation_provider_observers.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/automation/automation_provider_observers.h"
 
 #include <deque>
 #include <string>
 #include <vector>
 
@@ skipping 60 matching lines @@
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/browser/dom_operation_notification_details.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/process_type.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/process_manager.h"
+#include "extensions/browser/runtime_data.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/view_type.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/rect.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
 using content::DomOperationNotificationDetails;
@@ skipping 474 matching lines @@
       }
       break;
     }
 
     default:
       NOTREACHED();
   }
 }
 
 ExtensionReadyNotificationObserver::ExtensionReadyNotificationObserver(
-    extensions::ProcessManager* manager, ExtensionService* service,
-    AutomationProvider* automation, IPC::Message* reply_message)
-    : manager_(manager),
-      service_(service),
+    extensions::ExtensionSystem* system,

[not at google - send to devlin, 2014/01/18 01:09:04]

given this file isn't extensions related I'd expect this to be called
extension_system... sorry :(

[James Cook, 2014/01/18 02:01:18]

No worries. Done.

+    AutomationProvider* automation,
+    IPC::Message* reply_message)
+    : system_(system),
       automation_(automation->AsWeakPtr()),
       reply_message_(reply_message),
       extension_(NULL) {
   Init();
 }
 
 ExtensionReadyNotificationObserver::~ExtensionReadyNotificationObserver() {
 }
 
 void ExtensionReadyNotificationObserver::Init() {
@@ skipping 14 matching lines @@
     const content::NotificationDetails& details) {
   if (!automation_.get()) {
     delete this;
     return;
   }
 
   switch (type) {
     case content::NOTIFICATION_LOAD_STOP:
       // Only continue on with this method if our extension has been loaded
       // and all the extension views have stopped loading.
-      if (!extension_ || !DidExtensionViewsStopLoading(manager_))
+      if (!extension_ ||
+          !DidExtensionViewsStopLoading(system_->process_manager()))
         return;
       break;
     case chrome::NOTIFICATION_EXTENSION_LOADED: {
       const extensions::Extension* loaded_extension =
           content::Details<const extensions::Extension>(details).ptr();
       // Only track an internal or unpacked extension load.
       extensions::Manifest::Location location = loaded_extension->location();
       if (location != extensions::Manifest::INTERNAL &&
           !extensions::Manifest::IsUnpackedLocation(location))
         return;
       extension_ = loaded_extension;
-      if (!DidExtensionViewsStopLoading(manager_))
+      if (!DidExtensionViewsStopLoading(system_->process_manager()))
         return;
       // For some reason, the background extension view is not yet
       // created at this point so just checking whether all extension views
       // are loaded is not sufficient. If background page is not ready,
       // we wait for NOTIFICATION_LOAD_STOP.
-      if (!service_->IsBackgroundPageReady(extension_))
+      if (!system_->runtime_data()->IsBackgroundPageReady(extension_))
         return;
       break;
     }
     case chrome::NOTIFICATION_EXTENSION_INSTALL_ERROR:
     case chrome::NOTIFICATION_EXTENSION_LOAD_ERROR:
     case chrome::NOTIFICATION_EXTENSION_UPDATE_DISABLED:
       break;
     default:
       NOTREACHED();
       break;
@@ skipping 1990 matching lines @@
       if (automation_.get()) {
         AutomationJSONReply(automation_.get(), reply_message_.release())
             .SendSuccess(NULL);
       }
       delete this;
     }
   } else {
     NOTREACHED();
   }
 }