Refactor navigator.connect code to make it more flexible.

content/public/browser/navigator_connect_service.h

Index: content/public/browser/navigator_connect_service.h
diff --git a/content/renderer/pepper/pepper_plugin_instance_metrics.h b/content/public/browser/navigator_connect_service.h
similarity index 24%
copy from content/renderer/pepper/pepper_plugin_instance_metrics.h
copy to content/public/browser/navigator_connect_service.h
index 02d92e06056bb95287773ee136337b3bdfd18002..75df73d48f90ebccc63d287f4ba68a8399b71da4 100644
--- a/content/renderer/pepper/pepper_plugin_instance_metrics.h
+++ b/content/public/browser/navigator_connect_service.h
@@ -2,28 +2,29 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_INSTANCE_METRICS_H_
-#define CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_INSTANCE_METRICS_H_
+#ifndef CONTENT_PUBLIC_BROWSER_NAVIGATOR_CONNECT_SERVICE_H_
+#define CONTENT_PUBLIC_BROWSER_NAVIGATOR_CONNECT_SERVICE_H_
 
-#include <string>
 #include <vector>
 
-namespace ppapi {
-struct Preferences;
-}
+#include "base/strings/string16.h"
 
-namespace content {
+class GURL;
 
-// Record size metrics for all Flash instances.
-void RecordFlashSizeMetric(int width, int height);
+namespace content {
 
-// Records size metrics for Flash instances that are clicked.
-void RecordFlashClickSizeMetric(int width, int height);
+// Implementations of NavigatorConnectServiceFactory should return a new
+// instance of this class when accepting a connection. All messages send to the

[scheib, 2015/01/23 22:03:58]

send->sent

[Marijn Kruisselbrink, 2015/01/26 21:34:26]

Done.

+// service will then be passed to the OnMessage method.
+// Instances of this class are owned by NavigatorConnectContext.
+class NavigatorConnectService {
+ public:
+  virtual ~NavigatorConnectService() {}
 
-void SetGPUHistogram(const ppapi::Preferences& prefs,
-                     const std::vector<std::string>& arg_names,
-                     const std::vector<std::string>& arg_values);
+  virtual void OnMessage(const base::string16& message,
+                         const std::vector<int>& sent_message_port_ids) = 0;
+};
 
 }  // namespace content
 
-#endif  // CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_INSTANCE_METRICS_H_
+#endif  // CONTENT_PUBLIC_BROWSER_NAVIGATOR_CONNECT_SERVICE_H_