rebased ppapi vpnProvider

extensions/browser/api/vpn_provider/vpn_service.h

Index: extensions/browser/api/vpn_provider/vpn_service.h
diff --git a/extensions/browser/api/vpn_provider/vpn_service.h b/extensions/browser/api/vpn_provider/vpn_service.h
index 7aa1dc212ad67944b334dd796ba602a3e67c6b64..1595d24c8e8d7004672b26edbf374ce5abc492b3 100644
--- a/extensions/browser/api/vpn_provider/vpn_service.h
+++ b/extensions/browser/api/vpn_provider/vpn_service.h
@@ -162,6 +162,9 @@ class VpnService : public KeyedService,
   static std::string GetKey(const std::string& extension_id,
                             const std::string& configuration_name);
 
+  void AddPlugin(const std::string& service_id);
+  void RemovePlugin(const std::string& service_id);
+
  private:
   class VpnConfiguration;
 
@@ -224,6 +227,9 @@ class VpnService : public KeyedService,
   // Set the active configuration.
   void SetActiveConfiguration(VpnConfiguration* configuration);
 
+  // Check if the service_id was registered via PPAPI
+  bool RegisteredViaPlugin(const std::string& service_id);
+
   content::BrowserContext* browser_context_;
   std::string userid_hash_;
 
@@ -242,6 +248,8 @@ class VpnService : public KeyedService,
   // Service path does not own the VpnConfigurations.
   StringToConfigurationMap service_path_to_configuration_map_;
 
+  std::set<std::string> pepper_plugin_set_;
+
   base::WeakPtrFactory<VpnService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VpnService);