Generate and connect a Pepper identifier for Chrome OS

ppapi/proxy/ppb_flash_proxy.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 "ppapi/proxy/ppb_flash_proxy.h"
 
 #include <map>
 #include <set>
 
 #include "base/logging.h"
@@ skipping 406 matching lines @@
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_CreateDir,
                         OnHostMsgCreateDir)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_QueryFile,
                         OnHostMsgQueryFile)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_GetDirContents,
                         OnHostMsgGetDirContents)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_OpenFileRef,
                         OnHostMsgOpenFileRef)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_QueryFileRef,
                         OnHostMsgQueryFileRef)
+    IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_GetDeviceID,
+                        OnHostMsgGetDeviceID)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   // TODO(brettw) handle bad messages!
   return handled;
 }
 
 void PPB_Flash_Proxy::SetInstanceAlwaysOnTop(PP_Instance instance,
                                              PP_Bool on_top) {
   dispatcher()->Send(new PpapiHostMsg_PPBFlash_SetInstanceAlwaysOnTop(
       API_ID_PPB_FLASH, instance, on_top));
@@ skipping 106 matching lines @@
   return PP_ERROR_NOTSUPPORTED;
 }
 
 void PPB_Flash_Proxy::UpdateActivity(PP_Instance instance) {
   PluginGlobals::Get()->plugin_proxy_delegate()->SendToBrowser(
       new PpapiHostMsg_PPBFlash_UpdateActivity(API_ID_PPB_FLASH));
 }
 
 PP_Var PPB_Flash_Proxy::GetDeviceID(PP_Instance instance) {
   std::string id;
-  PluginGlobals::Get()->plugin_proxy_delegate()->SendToBrowser(
-      new PpapiHostMsg_PPBFlash_GetDeviceID(API_ID_PPB_FLASH, &id));
+  dispatcher()->Send(new PpapiHostMsg_PPBFlash_GetDeviceID(
+      API_ID_PPB_FLASH, instance, &id));
   return StringVar::StringToPPVar(id);
 }
 
 int32_t PPB_Flash_Proxy::GetSettingInt(PP_Instance instance,
                                        PP_FlashSetting setting) {
   switch (setting) {
     case PP_FLASHSETTING_3DENABLED:
       return static_cast<PluginDispatcher*>(dispatcher())->preferences().
           is_3d_supported;
     case PP_FLASHSETTING_INCOGNITO:
@@ skipping 567 matching lines @@
     int32_t* result) {
   EnterInstanceNoLock enter(instance);
   if (enter.failed()) {
     *result = PP_ERROR_BADARGUMENT;
     return;
   }
   *result = enter.functions()->GetFlashAPI()->QueryFileRef(
       instance, host_resource.host_resource(), info);
 }
 
+void PPB_Flash_Proxy::OnHostMsgGetDeviceID(PP_Instance instance,
+                                           std::string* id) {
+  EnterInstanceNoLock enter(instance);
+  *id = "";

[brettw, 2012/05/03 20:34:21]

id->clear()

[Will Drewry, 2012/05/03 21:58:49]

Done.

+  if (enter.succeeded()) {
+    PP_Var id_var = enter.functions()->GetFlashAPI()->GetDeviceID(instance);

[brettw, 2012/05/03 20:34:21]

This leaks the string. You should probably change the message to just pass a
var, which will handle all the string stuff for you.

See OnHostMsgReadClipboardData which returns a var.

[Will Drewry, 2012/05/03 21:58:49]

Done - I think :) Initial tests all look good, but I'm not sure if I missed any
spots that need attention still.

+    StringVar* id_str = StringVar::FromPPVar(id_var);
+    if (id_str) {

[brettw, 2012/05/03 20:34:21]

No {} here.

[Will Drewry, 2012/05/03 21:58:49]

Done.

+      *id = id_str->value();
+    }
+  }
+}
+
 }  // namespace proxy
 }  // namespace ppapi