content: Move all listeners of NOTIFICATION_RENDER_VIEW_HOST_CREATED out of content.

chrome/test/base/web_ui_browsertest.cc

 // 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 "chrome/test/base/web_ui_browsertest.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/printing/print_preview_dialog_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/web_ui_test_handler.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/test_chrome_web_ui_controller_factory.h"
 #include "chrome/test/base/test_tab_strip_model_observer.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/navigation_controller.h"
+#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
+#include "content/public/browser/notification_service.h"
+#include "content/public/browser/notification_types.h"
+#include "content/public/browser/render_view_host_observer.h"
 #include "content/public/browser/url_data_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui_controller.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "net/base/net_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest-spi.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/resource/resource_handle.h"
 
@@ skipping 23 matching lines @@
                 const std::string& str) {
   if (severity == logging::LOG_ERROR &&
       file &&
       std::string("CONSOLE") == file) {
     error_messages_.Get().push_back(str);
   }
 
   return false;
 }
 
+class RenderViewHostInitializedObserver
+    : public content::RenderViewHostObserver {
+ public:
+  RenderViewHostInitializedObserver(content::RenderViewHost* render_view_host,
+                                    content::JsInjectionReadyObserver* observer)
+      : content::RenderViewHostObserver(render_view_host),
+        injection_observer_(observer) {
+  }
+
+  // content::RenderViewHostObserver:
+  virtual void RenderViewHostInitialized() OVERRIDE {
+    injection_observer_->OnJsInjectionReady(render_view_host());
+  }
+
+ private:
+  content::JsInjectionReadyObserver* injection_observer_;
+
+  DISALLOW_COPY_AND_ASSIGN(RenderViewHostInitializedObserver);
+};
+
+class WebUIJsInjectionReadyObserver : public content::NotificationObserver {
+ public:
+  explicit WebUIJsInjectionReadyObserver(
+      content::JsInjectionReadyObserver* observer)
+      : injection_observer_(observer) {
+    registrar_.Add(this, content::NOTIFICATION_RENDER_VIEW_HOST_CREATED,
+                   content::NotificationService::AllSources());
+  }
+
+  // content::NotificationObserver:
+  virtual void Observe(int type,
+                       const content::NotificationSource& source,
+                       const content::NotificationDetails& details) OVERRIDE {
+    DCHECK_EQ(content::NOTIFICATION_RENDER_VIEW_HOST_CREATED, type);
+
+    rvh_observer_.reset(new RenderViewHostInitializedObserver(
+        content::Source<content::RenderViewHost>(source).ptr(),
+        injection_observer_));
+  }
+
+ private:
+  content::JsInjectionReadyObserver* injection_observer_;
+
+  scoped_ptr<RenderViewHostInitializedObserver> rvh_observer_;
+
+  content::NotificationRegistrar registrar_;
+
+  DISALLOW_COPY_AND_ASSIGN(WebUIJsInjectionReadyObserver);
+};
+
 }  // namespace
 
 WebUIBrowserTest::~WebUIBrowserTest() {}
 
 void WebUIBrowserTest::AddLibrary(const base::FilePath& library_path) {
   user_libraries_.push_back(library_path);
 }
 
 // Add a helper JS library to the given WebUIBrowserTest from a path relative to
 // base::DIR_SOURCE_ROOT.
@@ skipping 120 matching lines @@
   ASSERT_FALSE(libraries_preloaded_);
   ConstValueVector args;
   args.push_back(new base::StringValue(preload_test_fixture));
   args.push_back(new base::StringValue(preload_test_name));
   RunJavascriptUsingHandler(
       "preloadJavascriptLibraries", args, false, false, preload_host);
   libraries_preloaded_ = true;
 }
 
 void WebUIBrowserTest::BrowsePreload(const GURL& browse_to) {
+  WebUIJsInjectionReadyObserver injection_observer(this);
   content::TestNavigationObserver navigation_observer(
       content::Source<NavigationController>(
           &browser()->tab_strip_model()->
               GetActiveWebContents()->GetController()),
-      this, 1);
+      1);
   chrome::NavigateParams params(browser(), GURL(browse_to),
                                 content::PAGE_TRANSITION_TYPED);
   params.disposition = CURRENT_TAB;
   chrome::Navigate(&params);
   navigation_observer.WaitForObservation(
       base::Bind(&content::RunMessageLoop),
       base::Bind(&MessageLoop::Quit,
                  base::Unretained(MessageLoopForUI::current())));
 }
 
@@ skipping 487 matching lines @@
 // testDone directly and expect pass result.
 IN_PROC_BROWSER_TEST_F(WebUIBrowserAsyncTest, TestTestDoneEarlyPassesAsync) {
   ASSERT_TRUE(RunJavascriptAsyncTest("testDone"));
 }
 
 // Test that calling testDone during RunJavascriptTest still completes when
 // waiting for async result.
 IN_PROC_BROWSER_TEST_F(WebUIBrowserAsyncTest, TestTestDoneEarlyPasses) {
   ASSERT_TRUE(RunJavascriptTest("testDone"));
 }