Revert 135000 - Re-implement the screensaver to use WebView instead of ExtensionDialogHost.

Use WebView to render the screensaver extension instead of ExtensionDialogHost. Using the RenderViewGone override to detect termination of the renderer process to restart it.
Added browser tests.

R=ben@chromium.org,sky@chromium.org
BUG=chromium-os:28211
TEST=Tested that the screensaver comes up; tested the reload via crashing the extension renderer with SIG_ABRT; also ran browser tests.

Review URL: https://chromiumcodereview.appspot.com/10191010

TBR=rkc@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10335010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135004 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 0 insertions, 33 deletions

diff --git a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
index 82ad589..981db9b 100644
--- a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
+++ b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
@@ -90,12 +90,6 @@ class AccessibilityViewsDelegate : public views::ViewsDelegate {
   }
 #endif
 
-  virtual content::WebContents* CreateWebContents(
-      content::BrowserContext* browser_context,
-      content::SiteInstance* site_instance) OVERRIDE {
-    return NULL;
-  }
-
   DISALLOW_COPY_AND_ASSIGN(AccessibilityViewsDelegate);
 };
 
diff --git a/chrome/browser/ui/views/ash/chrome_shell_delegate.cc b/chrome/browser/ui/views/ash/chrome_shell_delegate.cc
index 3e29621..368d798 100644
--- a/chrome/browser/ui/views/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/views/ash/chrome_shell_delegate.cc
@@ -186,10 +186,6 @@ void ChromeShellDelegate::OpenMobileSetup() {
 #endif
 }
 
-content::BrowserContext* ChromeShellDelegate::GetCurrentBrowserContext() {
-  return ProfileManager::GetDefaultProfile();
-}
-
 ash::AppListViewDelegate*
     ChromeShellDelegate::CreateAppListViewDelegate() {
   // Shell will own the created delegate.
diff --git a/chrome/browser/ui/views/ash/chrome_shell_delegate.h b/chrome/browser/ui/views/ash/chrome_shell_delegate.h
index 9415ce4..7a71f49 100644
--- a/chrome/browser/ui/views/ash/chrome_shell_delegate.h
+++ b/chrome/browser/ui/views/ash/chrome_shell_delegate.h
@@ -42,7 +42,6 @@ class ChromeShellDelegate : public ash::ShellDelegate,
   virtual void OpenFileManager() OVERRIDE;
   virtual void OpenCrosh() OVERRIDE;
   virtual void OpenMobileSetup() OVERRIDE;
-  virtual content::BrowserContext* GetCurrentBrowserContext() OVERRIDE;
   virtual ash::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
   virtual void StartPartialScreenshot(
       ash::ScreenshotDelegate* screenshot_delegate) OVERRIDE;
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
index cb5d34d..62465f5 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
@@ -128,12 +128,6 @@ class ViewsDelegateImpl : public views::ViewsDelegate {
   }
 #endif
 
-  virtual content::WebContents* CreateWebContents(
-      content::BrowserContext* browser_context,
-      content::SiteInstance* site_instance) OVERRIDE {
-    return NULL;
-  }
-
  private:
   DISALLOW_COPY_AND_ASSIGN(ViewsDelegateImpl);
 };
diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc
index 5b6b3e3..51c573e 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.cc
+++ b/chrome/browser/ui/views/chrome_views_delegate.cc
@@ -170,9 +170,3 @@ views::NativeWidgetHelperAura* ChromeViewsDelegate::CreateNativeWidgetHelper(
 #endif
 }
 #endif
-
-content::WebContents* ChromeViewsDelegate::CreateWebContents(
-    content::BrowserContext* browser_context,
-    content::SiteInstance* site_instance) {
-  return NULL;
-}
diff --git a/chrome/browser/ui/views/chrome_views_delegate.h b/chrome/browser/ui/views/chrome_views_delegate.h
index 963150d..c7e4b7c 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.h
+++ b/chrome/browser/ui/views/chrome_views_delegate.h
@@ -51,10 +51,6 @@ class ChromeViewsDelegate : public views::ViewsDelegate {
       views::NativeWidgetAura* native_widget) OVERRIDE;
 #endif
 
-  virtual content::WebContents* CreateWebContents(
-      content::BrowserContext* browser_context,
-      content::SiteInstance* site_instance) OVERRIDE;
-
  private:
   DISALLOW_COPY_AND_ASSIGN(ChromeViewsDelegate);
 };
diff --git a/chrome/browser/ui/views/menu_model_adapter_test.cc b/chrome/browser/ui/views/menu_model_adapter_test.cc
index 98a6683..740ec42 100644
--- a/chrome/browser/ui/views/menu_model_adapter_test.cc
+++ b/chrome/browser/ui/views/menu_model_adapter_test.cc
@@ -95,12 +95,6 @@ class TestViewsDelegate : public views::ViewsDelegate {
   }
 #endif
 
-  content::WebContents* CreateWebContents(
-      content::BrowserContext* browser_context,
-      content::SiteInstance* site_instance) OVERRIDE {
-    return NULL;
-  }
-
  private:
   DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate);
 };