In preparation for becoming an internal plugin in chrome I did these things:...

plugin/cross/o3d_glue.cc

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 149 matching lines @@
 #ifdef OS_LINUX
   memset(got_double_click_, 0, sizeof(got_double_click_));
 #endif
 
   // create an O3D object
   client_ = new Client(&service_locator_);
 
   globals_npobject_ = glue::CreateStaticNPObject(npp);
   client_npobject_ =
       glue::namespace_o3d::class_Client::GetNPObject(npp, client_);
-  user_agent_ = GetUserAgent(npp);
+  user_agent_ = o3d::GetUserAgent(npp);
 }
 
 PluginObject::~PluginObject() {
 }
 
 void PluginObject::Init(int argc, char* argn[], char* argv[]) {
   DCHECK(argc == 0 || (argn != NULL && argv != NULL));
   features_ = new Features(&service_locator_);
 
   std::string o3d_name("o3d_features");
@@ skipping 17 matching lines @@
   o3d::NPObjectPtr<NPObject> np_plugin_ptr(this);
   np_v8_bridge_.SetGlobalProperty(o3d::String("plugin"),
                                   np_plugin_ptr);
 }
 
 void PluginObject::TearDown() {
 #ifdef OS_WIN
   ClearPluginProperty(hWnd_);
 #endif  // OS_WIN
 #ifdef OS_MACOSX
-  ReleaseSafariBrowserWindow(mac_cocoa_window_);
+  o3d::ReleaseSafariBrowserWindow(mac_cocoa_window_);
 #endif
   UnmapAll();
 
   // Delete the StreamManager to cleanup any streams that are in midflight.
   // This needs to happen here, before the client is deleted as the streams
   // could be holding references to FileRequest objects.
   stream_manager_.reset(NULL);
 
   delete client_;
   client_ = NULL;
 
   // Release the graphics context before deletion.
   DeleteRenderer();
 
   delete features_;
   features_ = NULL;
 
   // There is a reference cycle between the V8 bridge and the plugin.
   // Explicitly remove all V8 references during tear-down, so that the cycle is
   // broken, and the reference counting system will successfully delete the
   // plugin.
   np_v8_bridge_.ReleaseNPObjects();
 }
 
 void PluginObject::CreateRenderer(const o3d::DisplayWindow& display_window) {
-  if (!CheckConfig(npp_)) {
+  if (!o3d::CheckConfig(npp_)) {
     renderer_init_status_ = o3d::Renderer::GPU_NOT_UP_TO_SPEC;
   } else {
     renderer_ = o3d::Renderer::CreateDefaultRenderer(&service_locator_);
     DCHECK(renderer_);
 
     // Attempt to initialize renderer.
     renderer_init_status_ = renderer_->Init(display_window, false);
     if (renderer_init_status_ != o3d::Renderer::SUCCESS) {
       DeleteRenderer();
     }
@@ skipping 27 matching lines @@
 // from Safari (on other browsers this tab value should always be NULL).
 // Written so that last_mac_event_time_ is always valid or NULL.
 void PluginObject::MacEventReceived() {
   CFDateRef now = CFDateCreate(NULL, CFAbsoluteTimeGetCurrent());
   CFDateRef previousTime = last_mac_event_time_;
   last_mac_event_time_ = now;
   if (previousTime != NULL) {
     CFRelease(previousTime);
   }
   if (!mac_cocoa_window_) {
-    mac_cocoa_window_ = SafariBrowserWindowForWindowRef(mac_window_);
+    mac_cocoa_window_ = o3d::SafariBrowserWindowForWindowRef(mac_window_);
   }
   mac_window_selected_tab_ =
-      SelectedTabForSafariBrowserWindow(mac_cocoa_window_);
+      o3d::SelectedTabForSafariBrowserWindow(mac_cocoa_window_);
 }
 
 // Returns the time elapsed since the MacEventReceived function was last called.
 CFTimeInterval PluginObject::TimeSinceLastMacEvent() {
   CFTimeInterval elapsed = 0.0;
   if (last_mac_event_time_ != NULL) {
     CFDateRef now = CFDateCreate(NULL, CFAbsoluteTimeGetCurrent());
     elapsed = CFDateGetTimeIntervalSinceDate(now, last_mac_event_time_);
     CFRelease(now);
   }
   return elapsed;
 }
 
 // Detects if Safari has hidden our tab.
 // The heuristic is that we have not received any Mac events for a certain time
 // and also the value for selected tab is different from the value it had the
 // last time we did get a Mac event.
 bool PluginObject::DetectTabHiding() {
   const CFTimeInterval kMacTimeOut = 0.2;  // a fifth of a second
   if (TimeSinceLastMacEvent() < kMacTimeOut)
     return false;
 
   if (!mac_cocoa_window_) {
-    mac_cocoa_window_ = SafariBrowserWindowForWindowRef(mac_window_);
+    mac_cocoa_window_ = o3d::SafariBrowserWindowForWindowRef(mac_window_);
   }
 
-  return SelectedTabForSafariBrowserWindow(mac_cocoa_window_) !=
+  return o3d::SelectedTabForSafariBrowserWindow(mac_cocoa_window_) !=
       mac_window_selected_tab_;
 }
 
 
 // Pick a constant way out of Apple's 0-22 range for our "no theme cursor"
 // constant.
 const ThemeCursor kNoThemeCursorForThat = 1000;
 
 // Map o3d cursors to Mac theme cursors if possible, otherwise return
 // kNoThemeCursorForThat.
@@ skipping 220 matching lines @@
 }
 
 static bool PluginGetProperty(NPObject *header, NPIdentifier name,
                               NPVariant *variant) {
   DebugScopedId id(name);
   PluginObject *plugin_object = static_cast<PluginObject *>(header);
   NPP npp = plugin_object->npp();
   if (name == property_ids[PROP_GPU_CONFIG]) {
     // Gets the GPU config (VendorID, DeviceID, name) as a string.
     // NOTE: this should probably be removed before we ship.
-    GPUDevice device;
-    bool result = GetGPUDevice(npp, &device);
+    o3d::GPUDevice device;
+    bool result = o3d::GetGPUDevice(npp, &device);
     if (!result) return false;
     std::string return_value = std::string("VendorID = 0x");
     char id_text[9];
     base::snprintf(id_text, sizeof(id_text), "%04x", device.vendor_id);
     return_value += id_text;
     return_value += ", DeviceID = 0x";
     base::snprintf(id_text, sizeof(id_text), "%04x", device.device_id);
     return_value += id_text;
     return_value += ", DeviceName = '";
     return_value += device.name + "'";
@@ skipping 313 matching lines @@
   PluginObject *plugin_object = static_cast<PluginObject *>(npp->pdata);
   if (plugin_object) {  // May not be initialized yet.
     return plugin_object->client()->ProfileToString();
   } else {
     return "";
   }
 }
 
 }  // namespace globals
 }  // namespace glue