[Sheriff] Revert "Revert "Revert 266297 "1. Handle the case of empty embedder_extension_id..."""

chrome/browser/guestview/adview/adview_guest.cc

Index: chrome/browser/guestview/adview/adview_guest.cc
diff --git a/chrome/browser/guest_view/ad_view/ad_view_guest.cc b/chrome/browser/guestview/adview/adview_guest.cc
similarity index 63%
rename from chrome/browser/guest_view/ad_view/ad_view_guest.cc
rename to chrome/browser/guestview/adview/adview_guest.cc
index b09b8df377d9434a95c6d5cfc4367de167927e15..6b0de6fbca74d5e556d2d2ccca5982b2566817c3 100644
--- a/chrome/browser/guest_view/ad_view/ad_view_guest.cc
+++ b/chrome/browser/guestview/adview/adview_guest.cc
@@ -1,12 +1,12 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// 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/guest_view/ad_view/ad_view_guest.h"
+#include "chrome/browser/guestview/adview/adview_guest.h"
 
 #include "base/strings/string_util.h"
-#include "chrome/browser/guest_view/ad_view/ad_view_constants.h"
-#include "chrome/browser/guest_view/guest_view_constants.h"
+#include "chrome/browser/guestview/adview/adview_constants.h"
+#include "chrome/browser/guestview/guestview_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/net_errors.h"
 
@@ -14,12 +14,30 @@ using content::WebContents;
 
 AdViewGuest::AdViewGuest(WebContents* guest_web_contents,
                          const std::string& extension_id)
-    : GuestView<AdViewGuest>(guest_web_contents, extension_id),
+    : GuestView(guest_web_contents, extension_id),
       WebContentsObserver(guest_web_contents) {
 }
 
 // static
-const char AdViewGuest::Type[] = "adview";
+AdViewGuest* AdViewGuest::From(int embedder_process_id,
+                               int guest_instance_id) {
+  GuestView* guest = GuestView::From(embedder_process_id, guest_instance_id);
+  if (!guest)
+    return NULL;
+  return guest->AsAdView();
+}
+
+GuestView::Type AdViewGuest::GetViewType() const {
+  return GuestView::ADVIEW;
+}
+
+WebViewGuest* AdViewGuest::AsWebView() {
+  return NULL;
+}
+
+AdViewGuest* AdViewGuest::AsAdView() {
+  return this;
+}
 
 AdViewGuest::~AdViewGuest() {
 }
@@ -34,8 +52,7 @@ void AdViewGuest::DidCommitProvisionalLoadForFrame(
   scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
   args->SetString(guestview::kUrl, url.spec());
   args->SetBoolean(guestview::kIsTopLevel, is_main_frame);
-  DispatchEvent(
-      new GuestViewBase::Event(adview::kEventLoadCommit, args.Pass()));
+  DispatchEvent(new GuestView::Event(adview::kEventLoadCommit, args.Pass()));
 }
 
 void AdViewGuest::DidFailProvisionalLoad(
@@ -54,5 +71,5 @@ void AdViewGuest::DidFailProvisionalLoad(
   args->SetBoolean(guestview::kIsTopLevel, is_main_frame);
   args->SetString(guestview::kUrl, validated_url.spec());
   args->SetString(guestview::kReason, error_type);
-  DispatchEvent(new GuestViewBase::Event(adview::kEventLoadAbort, args.Pass()));
+  DispatchEvent(new GuestView::Event(adview::kEventLoadAbort, args.Pass()));
 }