Revert "Revert 266297 "1. Handle the case of empty embedder_extension_id...""

chrome/browser/guestview/guestview.cc

Index: chrome/browser/guestview/guestview.cc
diff --git a/chrome/browser/guestview/guestview.cc b/chrome/browser/guestview/guestview.cc
deleted file mode 100644
index 7cd6c59bab5223afbebfa899d16778c66209e240..0000000000000000000000000000000000000000
--- a/chrome/browser/guestview/guestview.cc
+++ /dev/null
@@ -1,223 +0,0 @@
-// Copyright 2013 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/guestview/guestview.h"
-
-#include "base/lazy_instance.h"
-#include "chrome/browser/guestview/adview/adview_guest.h"
-#include "chrome/browser/guestview/guestview_constants.h"
-#include "chrome/browser/guestview/webview/webview_guest.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/common/content_settings.h"
-#include "content/public/browser/render_process_host.h"
-#include "content/public/browser/web_contents.h"
-#include "content/public/common/url_constants.h"
-#include "extensions/browser/event_router.h"
-#include "net/base/escape.h"
-
-using content::WebContents;
-
-namespace {
-
-// <embedder_process_id, guest_instance_id> => GuestView*
-typedef std::map<std::pair<int, int>, GuestView*> EmbedderGuestViewMap;
-static base::LazyInstance<EmbedderGuestViewMap> embedder_guestview_map =
-    LAZY_INSTANCE_INITIALIZER;
-
-typedef std::map<WebContents*, GuestView*> WebContentsGuestViewMap;
-static base::LazyInstance<WebContentsGuestViewMap> webcontents_guestview_map =
-    LAZY_INSTANCE_INITIALIZER;
-
-}  // namespace
-
-GuestView::Event::Event(const std::string& name,
-                        scoped_ptr<base::DictionaryValue> args)
-    : name_(name),
-      args_(args.Pass()) {
-}
-
-GuestView::Event::~Event() {
-}
-
-scoped_ptr<base::DictionaryValue> GuestView::Event::GetArguments() {
-  return args_.Pass();
-}
-
-GuestView::GuestView(WebContents* guest_web_contents,
-                     const std::string& embedder_extension_id)
-    : guest_web_contents_(guest_web_contents),
-      embedder_web_contents_(NULL),
-      embedder_extension_id_(embedder_extension_id),
-      embedder_render_process_id_(0),
-      browser_context_(guest_web_contents->GetBrowserContext()),
-      guest_instance_id_(guest_web_contents->GetEmbeddedInstanceID()),
-      view_instance_id_(guestview::kInstanceIDNone),
-      weak_ptr_factory_(this) {
-  webcontents_guestview_map.Get().insert(
-      std::make_pair(guest_web_contents, this));
-}
-
-// static
-GuestView::Type GuestView::GetViewTypeFromString(const std::string& api_type) {
-  if (api_type == "adview") {
-    return GuestView::ADVIEW;
-  } else if (api_type == "webview") {
-    return GuestView::WEBVIEW;
-  }
-  return GuestView::UNKNOWN;
-}
-
-// static
-GuestView* GuestView::Create(WebContents* guest_web_contents,
-                             const std::string& embedder_extension_id,
-                             GuestView::Type view_type) {
-  switch (view_type) {
-    case GuestView::WEBVIEW:
-      return new WebViewGuest(guest_web_contents, embedder_extension_id);
-    case GuestView::ADVIEW:
-      return new AdViewGuest(guest_web_contents, embedder_extension_id);
-    default:
-      NOTREACHED();
-      return NULL;
-  }
-}
-
-// static
-GuestView* GuestView::FromWebContents(WebContents* web_contents) {
-  WebContentsGuestViewMap* guest_map = webcontents_guestview_map.Pointer();
-  WebContentsGuestViewMap::iterator it = guest_map->find(web_contents);
-  return it == guest_map->end() ? NULL : it->second;
-}
-
-// static
-GuestView* GuestView::From(int embedder_process_id, int guest_instance_id) {
-  EmbedderGuestViewMap* guest_map = embedder_guestview_map.Pointer();
-  EmbedderGuestViewMap::iterator it = guest_map->find(
-      std::make_pair(embedder_process_id, guest_instance_id));
-  return it == guest_map->end() ? NULL : it->second;
-}
-
-// static
-bool GuestView::GetGuestPartitionConfigForSite(const GURL& site,
-                                               std::string* partition_domain,
-                                               std::string* partition_name,
-                                               bool* in_memory) {
-  if (!site.SchemeIs(content::kGuestScheme))
-    return false;
-
-  // Since guest URLs are only used for packaged apps, there must be an app
-  // id in the URL.
-  CHECK(site.has_host());
-  *partition_domain = site.host();
-  // Since persistence is optional, the path must either be empty or the
-  // literal string.
-  *in_memory = (site.path() != "/persist");
-  // The partition name is user supplied value, which we have encoded when the
-  // URL was created, so it needs to be decoded.
-  *partition_name = net::UnescapeURLComponent(site.query(),
-                                              net::UnescapeRule::NORMAL);
-  return true;
-}
-
-// static
-void GuestView::GetDefaultContentSettingRules(
-    RendererContentSettingRules* rules, bool incognito) {
-  rules->image_rules.push_back(ContentSettingPatternSource(
-    ContentSettingsPattern::Wildcard(),
-    ContentSettingsPattern::Wildcard(),
-    CONTENT_SETTING_ALLOW,
-    std::string(),
-    incognito));
-
-  rules->script_rules.push_back(ContentSettingPatternSource(
-    ContentSettingsPattern::Wildcard(),
-    ContentSettingsPattern::Wildcard(),
-    CONTENT_SETTING_ALLOW,
-    std::string(),
-    incognito));
-}
-
-void GuestView::Attach(content::WebContents* embedder_web_contents,
-                       const base::DictionaryValue& args) {
-  embedder_web_contents_ = embedder_web_contents;
-  embedder_render_process_id_ =
-      embedder_web_contents->GetRenderProcessHost()->GetID();
-  args.GetInteger(guestview::kParameterInstanceId, &view_instance_id_);
-
-  std::pair<int, int> key(embedder_render_process_id_, guest_instance_id_);
-  embedder_guestview_map.Get().insert(std::make_pair(key, this));
-
-  // GuestView::Attach is called prior to initialization (and initial
-  // navigation) of the guest in the content layer in order to permit mapping
-  // the necessary associations between the <*view> element and its guest. This
-  // is needed by the <webview> WebRequest API to allow intercepting resource
-  // requests during navigation. However, queued events should be fired after
-  // content layer initialization in order to ensure that load events (such as
-  // 'loadstop') fire in embedder after the contentWindow is available.
-  if (!in_extension())
-    return;
-
-  base::MessageLoop::current()->PostTask(
-      FROM_HERE,
-      base::Bind(&GuestView::SendQueuedEvents,
-                 weak_ptr_factory_.GetWeakPtr()));
-}
-
-GuestView::Type GuestView::GetViewType() const {
-  return GuestView::UNKNOWN;
-}
-
-WebViewGuest* GuestView::AsWebView() {
-  return NULL;
-}
-
-AdViewGuest* GuestView::AsAdView() {
-  return NULL;
-}
-
-GuestView::~GuestView() {
-  std::pair<int, int> key(embedder_render_process_id_, guest_instance_id_);
-  embedder_guestview_map.Get().erase(key);
-
-  webcontents_guestview_map.Get().erase(guest_web_contents());
-
-  pending_events_.clear();
-}
-
-void GuestView::DispatchEvent(Event* event) {
-  scoped_ptr<Event> event_ptr(event);
-  if (!in_extension()) {
-    NOTREACHED();
-    return;
-  }
-
-  if (!attached()) {
-    pending_events_.push_back(linked_ptr<Event>(event_ptr.release()));
-    return;
-  }
-
-  Profile* profile = Profile::FromBrowserContext(browser_context_);
-
-  extensions::EventFilteringInfo info;
-  info.SetURL(GURL());
-  info.SetInstanceID(guest_instance_id_);
-  scoped_ptr<base::ListValue> args(new base::ListValue());
-  args->Append(event->GetArguments().release());
-
-  extensions::EventRouter::DispatchEvent(
-      embedder_web_contents_, profile, embedder_extension_id_,
-      event->name(), args.Pass(),
-      extensions::EventRouter::USER_GESTURE_UNKNOWN, info);
-}
-
-void GuestView::SendQueuedEvents() {
-  if (!attached())
-    return;
-
-  while (!pending_events_.empty()) {
-    linked_ptr<Event> event_ptr = pending_events_.front();
-    pending_events_.pop_front();
-    DispatchEvent(event_ptr.release());
-  }
-}