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

chrome/browser/guestview/adview/adview_guest.h

Index: chrome/browser/guestview/adview/adview_guest.h
diff --git a/chrome/browser/guest_view/ad_view/ad_view_guest.h b/chrome/browser/guestview/adview/adview_guest.h
similarity index 72%
rename from chrome/browser/guest_view/ad_view/ad_view_guest.h
rename to chrome/browser/guestview/adview/adview_guest.h
index 241c7d76a649177ac0d89244d7eb499fdeeca387..aaefe00e3644e169025c63f031e977dd3cdd695f 100644
--- a/chrome/browser/guest_view/ad_view/ad_view_guest.h
+++ b/chrome/browser/guestview/adview/adview_guest.h
@@ -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.
 
-#ifndef CHROME_BROWSER_GUEST_VIEW_AD_VIEW_AD_VIEW_GUEST_H_
-#define CHROME_BROWSER_GUEST_VIEW_AD_VIEW_AD_VIEW_GUEST_H_
+#ifndef CHROME_BROWSER_GUESTVIEW_ADVIEW_ADVIEW_GUEST_H_
+#define CHROME_BROWSER_GUESTVIEW_ADVIEW_ADVIEW_GUEST_H_
 
 #include "base/values.h"
-#include "chrome/browser/guest_view/guest_view.h"
+#include "chrome/browser/guestview/guestview.h"
 #include "content/public/browser/web_contents_observer.h"
 
 // An AdViewGuest is a WebContentsObserver on the guest WebContents of a
@@ -16,13 +16,18 @@
 // a particular embedder WebContents, we call this "attachment".
 // TODO(fsamuel): There might be an opportunity here to refactor and reuse code
 // between AdViewGuest and WebViewGuest.
-class AdViewGuest : public GuestView<AdViewGuest>,
+class AdViewGuest : public GuestView,
                     public content::WebContentsObserver {
  public:
   AdViewGuest(content::WebContents* guest_web_contents,
               const std::string& extension_id);
 
-  static const char Type[];
+  static AdViewGuest* From(int embedder_process_id, int instance_id);
+
+  // GuestView implementation.
+  virtual GuestView::Type GetViewType() const OVERRIDE;
+  virtual WebViewGuest* AsWebView() OVERRIDE;
+  virtual AdViewGuest* AsAdView() OVERRIDE;
 
  private:
   virtual ~AdViewGuest();
@@ -46,4 +51,4 @@ class AdViewGuest : public GuestView<AdViewGuest>,
   DISALLOW_COPY_AND_ASSIGN(AdViewGuest);
 };
 
-#endif  // CHROME_BROWSER_GUEST_VIEW_AD_VIEW_AD_VIEW_GUEST_H_
+#endif  // CHROME_BROWSER_GUESTVIEW_ADVIEW_ADVIEW_GUEST_H_