From 38fe4377a38ea50446784abc93224ccf4bcdda82 Mon Sep 17 00:00:00 2001
From: "fsamuel@chromium.org"
 <fsamuel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 1 May 2014 08:38:32 +0000
Subject: [PATCH] GuestView: Remove unnecessary member variable

BUG=351824

Review URL: https://codereview.chromium.org/264653004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267488 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/browser/guest_view/guest_view.h      | 8 ++++----
 chrome/browser/guest_view/guest_view_base.h | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/chrome/browser/guest_view/guest_view.h b/chrome/browser/guest_view/guest_view.h
index 14149d890c6beb..84b9b08bdbb4fd 100644
--- a/chrome/browser/guest_view/guest_view.h
+++ b/chrome/browser/guest_view/guest_view.h
@@ -24,16 +24,16 @@ class GuestView : public GuestViewBase {
   }
 
   // GuestViewBase implementation.
-  virtual const std::string& GetViewType() const OVERRIDE { return type_; }
+  virtual const char* GetViewType() const OVERRIDE {
+    return T::Type;
+  }
 
  protected:
   GuestView(content::WebContents* guest_web_contents,
             const std::string& embedder_extension_id)
-      : GuestViewBase(guest_web_contents, embedder_extension_id),
-        type_(T::Type) {}
+      : GuestViewBase(guest_web_contents, embedder_extension_id) {}
 
  private:
-  std::string type_;
   DISALLOW_COPY_AND_ASSIGN(GuestView);
 };
 
diff --git a/chrome/browser/guest_view/guest_view_base.h b/chrome/browser/guest_view/guest_view_base.h
index 442229751be58f..76ea724d5194dc 100644
--- a/chrome/browser/guest_view/guest_view_base.h
+++ b/chrome/browser/guest_view/guest_view_base.h
@@ -39,7 +39,7 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate {
   // Returns a *ViewGuest if this GuestView is of the given view type.
   template <typename T>
   T* As() {
-    if (GetViewType() == T::Type) {
+    if (!strcmp(GetViewType(), T::Type)) {
       return static_cast<T*>(this);
     }
     return NULL;
@@ -69,7 +69,7 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate {
   static void GetDefaultContentSettingRules(RendererContentSettingRules* rules,
                                             bool incognito);
 
-  virtual const std::string& GetViewType() const = 0;
+  virtual const char* GetViewType() const = 0;
 
   virtual void Attach(content::WebContents* embedder_web_contents,
                       const base::DictionaryValue& args);