Revert 134878 - 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/10316004

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

1 files changed, 0 insertions, 93 deletions

diff --git a/ash/screensaver/screensaver_view_unittest.cc b/ash/screensaver/screensaver_view_unittest.cc
deleted file mode 100644
index 47a19e2..0000000
--- a/ash/screensaver/screensaver_view_unittest.cc
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright (c) 2012 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 "ash/screensaver/screensaver_view.h"
-
-#include "ash/test/ash_test_base.h"
-#include "base/bind.h"
-#include "content/public/browser/browser_context.h"
-#include "ui/views/controls/webview/webview.h"
-#include "ui/views/test/test_views_delegate.h"
-#include "ui/views/test/webview_test_helper.h"
-
-namespace ash {
-namespace test {
-
-class ScreensaverViewTest : public ash::test::AshTestBase {
- public:
-  ScreensaverViewTest() {
-    url_ = GURL("http://www.google.com");
-    views_delegate_.reset(new views::TestViewsDelegate);
-    webview_test_helper_.reset(new views::WebViewTestHelper(message_loop()));
-  }
-
-  virtual ~ScreensaverViewTest() {}
-
-  virtual void SetUp() OVERRIDE {
-    AshTestBase::SetUp();
-    RunAllPendingInMessageLoop();
-  }
-
-  virtual void TearDown() OVERRIDE {
-    AshTestBase::TearDown();
-  }
-
-  void ExpectOpenScreensaver() {
-    internal::ScreensaverView* screensaver =
-        internal::ScreensaverView::GetInstance();
-    EXPECT_TRUE(screensaver != NULL);
-    if (!screensaver) return;
-
-    EXPECT_TRUE(screensaver->screensaver_webview_ != NULL);
-    if (!screensaver->screensaver_webview_) return;
-
-    EXPECT_TRUE(screensaver->screensaver_webview_->web_contents() != NULL);
-    if (!screensaver->screensaver_webview_->web_contents()) return;
-
-    EXPECT_EQ(screensaver->screensaver_webview_->web_contents()->GetURL(),
-              url_);
-  }
-
-  void ExpectClosedScreensaver() {
-    EXPECT_TRUE(internal::ScreensaverView::GetInstance() == NULL);
-  }
-
- protected:
-  GURL url_;
-
- private:
-  scoped_ptr<views::TestViewsDelegate> views_delegate_;
-  scoped_ptr<views::WebViewTestHelper> webview_test_helper_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScreensaverViewTest);
-};
-
-TEST_F(ScreensaverViewTest, ShowScreensaverAndClose) {
-  ash::ShowScreensaver(url_);
-  RunAllPendingInMessageLoop();
-  ExpectOpenScreensaver();
-
-  ash::CloseScreensaver();
-  ExpectClosedScreensaver();
-}
-
-TEST_F(ScreensaverViewTest, OutOfOrderMultipleShowAndClose) {
-  ash::CloseScreensaver();
-  ExpectClosedScreensaver();
-
-  ash::ShowScreensaver(url_);
-  ExpectOpenScreensaver();
-  RunAllPendingInMessageLoop();
-  ash::ShowScreensaver(url_);
-  ExpectOpenScreensaver();
-  RunAllPendingInMessageLoop();
-
-  ash::CloseScreensaver();
-  ExpectClosedScreensaver();
-  ash::CloseScreensaver();
-  ExpectClosedScreensaver();
-}
-
-}  // namespace test
-}  // namespace ash