GuestView: Lazy registration and once for all profiles

chrome/browser/guest_view/guest_view_base.cc

 // Copyright 2014 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 "chrome/browser/guest_view/guest_view_base.h"
 
 #include "base/lazy_instance.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/guest_view/app_view/app_view_guest.h"
 #include "chrome/browser/guest_view/guest_view_constants.h"
@@ skipping 125 matching lines @@
   webcontents_guestview_map.Get().insert(
       std::make_pair(guest_web_contents, this));
   GuestViewManager::FromBrowserContext(browser_context_)->
       AddGuest(guest_instance_id_, guest_web_contents);
 
   // Give the derived class an opportunity to perform additional initialization.
   DidInitialize();
 }
 
 // static
-void GuestViewBase::RegisterGuestViewTypes() {
-  GuestView<WebViewGuest>::Register();
-  GuestView<AppViewGuest>::Register();
-}
-
-// static
 void GuestViewBase::RegisterGuestViewType(
     const std::string& view_type,
     const GuestCreationCallback& callback) {
   GuestViewCreationMap::iterator it =
       guest_view_registry.Get().find(view_type);
   DCHECK(it == guest_view_registry.Get().end());
   guest_view_registry.Get()[view_type] = callback;
 }
 
 // static
 GuestViewBase* GuestViewBase::Create(
     content::BrowserContext* browser_context,
     int guest_instance_id,
     const std::string& view_type) {
+  if (guest_view_registry.Get().empty())
+    RegisterGuestViewTypes();
+
   GuestViewCreationMap::iterator it =
       guest_view_registry.Get().find(view_type);
   if (it == guest_view_registry.Get().end()) {
     NOTREACHED();
     return NULL;
   }
   return it->second.Run(browser_context, guest_instance_id);
 }
 
 // static
@@ skipping 203 matching lines @@
     // purpose. Let's self-destruct.
     delete this;
     callback.Run(NULL);
     return;
   }
   InitWithWebContents(embedder_extension_id,
                       embedder_render_process_id,
                       guest_web_contents);
   callback.Run(guest_web_contents);
 }
+
+// static
+void GuestViewBase::RegisterGuestViewTypes() {
+  AppViewGuest::Register();
+  WebViewGuest::Register();
+}