Move RenderViewHostObserver to content/public/browser/ and put it into the content namespace.

chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc

 // 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.
 
 #include "chrome/browser/ui/webui/chromeos/mobile_setup_ui.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 14 matching lines @@
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
-#include "content/browser/renderer_host/render_view_host_observer.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/render_view_host_observer.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::BrowserThread;
 
@@ skipping 71 matching lines @@
 chromeos::CellularNetwork* GetCellularNetwork(
     const std::string& service_path) {
   return chromeos::CrosLibrary::Get()->
       GetNetworkLibrary()->FindCellularNetworkByPath(service_path);
 }
 
 }  // namespace
 
 // Observes IPC messages from the rederer and notifies JS if frame loading error
 // appears.
-class PortalFrameLoadObserver : public RenderViewHostObserver {
+class PortalFrameLoadObserver : public content::RenderViewHostObserver {
  public:
   PortalFrameLoadObserver(RenderViewHost* host, WebUI* webui)
-      : RenderViewHostObserver(host), webui_(webui) {
+      : content::RenderViewHostObserver(host), webui_(webui) {
     DCHECK(webui_);
     Send(new ChromeViewMsg_StartFrameSniffer(routing_id(),
                                              UTF8ToUTF16("paymentForm")));
   }
 
   virtual ~PortalFrameLoadObserver() {}
 
   // IPC::Channel::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) {
     bool handled = true;
@@ skipping 1229 matching lines @@
   // Set up the chrome://mobilesetup/ source.
   Profile* profile = Profile::FromBrowserContext(contents->browser_context());
   profile->GetChromeURLDataManager()->AddDataSource(html_source);
 }
 
 void MobileSetupUI::RenderViewCreated(RenderViewHost* host) {
   ChromeWebUI::RenderViewCreated(host);
   // Destroyed by the corresponding RenderViewHost.
   new PortalFrameLoadObserver(host, tab_contents()->web_ui());
 }