Implement Just-In-Time Flash updates.

chrome/browser/plugins/plugin_observer.h

 // 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.
 
 #ifndef CHROME_BROWSER_PLUGINS_PLUGIN_OBSERVER_H_
 #define CHROME_BROWSER_PLUGINS_PLUGIN_OBSERVER_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
 #include <map>
 #endif
 
 class GURL;
 class PluginFinder;
 class PluginMetadata;
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
 class PluginInstaller;
 class PluginPlaceholderHost;
 #endif
 
+class ComponentObserver;
+
 namespace content {
 class WebContents;
 }
 
 namespace infobars {
 class InfoBarDelegate;
 }
 
 class PluginObserver : public content::WebContentsObserver,
                        public content::WebContentsUserData<PluginObserver> {
  public:
   ~PluginObserver() override;
 
   // content::WebContentsObserver implementation.
   void PluginCrashed(const base::FilePath& plugin_path,
                      base::ProcessId plugin_pid) override;
   bool OnMessageReceived(const IPC::Message& message,
                          content::RenderFrameHost* render_frame_host) override;
 
  private:
   explicit PluginObserver(content::WebContents* web_contents);
   friend class content::WebContentsUserData<PluginObserver>;
+  friend class ComponentObserver;

[Bernhard Bauer, 2016/07/28 10:25:10]

Could you make this an inner class? That way it would automatically have access
to private members, and not linger around in the global namespace.

[waffles, 2016/07/28 20:06:27]

Done.

 
   class PluginPlaceholderHost;
 
   // Message handlers:
   void OnBlockedUnauthorizedPlugin(const base::string16& name,
                                    const std::string& identifier);
   void OnBlockedOutdatedPlugin(int placeholder_id,
                                const std::string& identifier);
+  void OnBlockedUpdatePlugin(int placeholder_id,
+                             const std::string& identifier);
 #if defined(ENABLE_PLUGIN_INSTALLATION)
   void OnRemovePluginPlaceholderHost(int placeholder_id);
 #endif
+  void RemoveComponentObserver(int placeholder_id);
   void OnOpenAboutPlugins();
   void OnCouldNotLoadPlugin(const base::FilePath& plugin_path);
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
   // Stores all PluginPlaceholderHosts, keyed by their routing ID.
   std::map<int, PluginPlaceholderHost*> plugin_placeholders_;
 #endif
 
+  // Stores all PluginPlaceholderHosts, keyed by their routing ID.

[Bernhard Bauer, 2016/07/28 10:25:10]

Nit: stores all ComponentObservers?

[waffles, 2016/07/28 20:06:27]

Done.

+  std::map<int, ComponentObserver*> component_observers_;

[Bernhard Bauer, 2016/07/28 10:25:10]

This map could store unique_ptr<>'s now (|plugin_placeholders_| dates from
before that worked).

[waffles, 2016/07/28 20:06:27]

Done.

+
   base::WeakPtrFactory<PluginObserver> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginObserver);
 };
 
 #endif  // CHROME_BROWSER_PLUGINS_PLUGIN_OBSERVER_H_