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

content/test/test_content_client_initializer.h

Index: content/test/test_content_client_initializer.h
diff --git a/content/test/test_content_client_initializer.h b/content/test/test_content_client_initializer.h
new file mode 100644
index 0000000000000000000000000000000000000000..dd6579a31bf3c45c8c39c6b3a9386493ce320836
--- /dev/null
+++ b/content/test/test_content_client_initializer.h
@@ -0,0 +1,31 @@
+// Copyright (c) 2011 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 CONTENT_TEST_TEST_CONTENT_CLIENT_INITIALIZER_
+#define CONTENT_TEST_TEST_CONTENT_CLIENT_INITIALIZER_
+#pragma once
+
+#include "base/basictypes.h"
+#include "base/memory/scoped_ptr.h"
+
+class NotificationServiceImpl;
+
+namespace content {

[jam, 2012/05/01 18:55:33]

put this whole class in the content namespace

[rkc, 2012/05/02 00:51:03]

Done.

+class ContentClient;
+class ContentBrowserClient;
+}
+
+class TestContentClientInitializer {

[jam, 2012/05/01 18:55:33]

nit: please add a comment about what this class is used for

[rkc, 2012/05/02 00:51:03]

Done.

+ public:
+  TestContentClientInitializer();
+  ~TestContentClientInitializer();
+ private:

[jam, 2012/05/01 18:55:33]

nit: blank line above private

[rkc, 2012/05/02 00:51:03]

Done.

+  scoped_ptr<NotificationServiceImpl> notification_service_;
+  scoped_ptr<content::ContentClient> content_client_;
+  scoped_ptr<content::ContentBrowserClient> content_browser_client_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestContentClientInitializer);
+};
+
+#endif  // CONTENT_TEST_TEST_CONTENT_CLIENT_INITIALIZER_