Removal of Profile from content part 6.

content/browser/webui/web_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 "content/browser/webui/web_ui.h"
 
 #include "base/i18n/rtl.h"
 #include "base/json/json_writer.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/profiles/profile.h"
 #include "content/browser/child_process_security_policy.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/browser/webui/generic_handler.h"
 #include "content/common/bindings_policy.h"
 #include "content/common/view_messages.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
@@ skipping 16 matching lines @@
 }
 
 WebUI::WebUI(TabContents* contents)
     : hide_favicon_(false),
       focus_location_bar_by_default_(false),
       should_hide_url_(false),
       link_transition_type_(PageTransition::LINK),
       bindings_(BindingsPolicy::WEB_UI),
       register_callback_overwrites_(false),
       tab_contents_(contents) {
+  DCHECK(contents);
   GenericHandler* handler = new GenericHandler();
   AddMessageHandler(handler->Attach(this));
 }
 
 WebUI::~WebUI() {
   STLDeleteContainerPairSecondPointers(message_callbacks_.begin(),
                                        message_callbacks_.end());
   STLDeleteContainerPointers(handlers_.begin(), handlers_.end());
 }
 
@@ skipping 89 matching lines @@
 void WebUI::RegisterMessageCallback(const std::string &message,
                                     MessageCallback *callback) {
   std::pair<MessageCallbackMap::iterator, bool> result =
       message_callbacks_.insert(std::make_pair(message, callback));
 
   // Overwrite preexisting message callback mappings.
   if (register_callback_overwrites() && !result.second)
     result.first->second = callback;
 }
 
-Profile* WebUI::GetProfile() const {
-  DCHECK(tab_contents());
-  return Profile::FromBrowserContext(tab_contents()->browser_context());
-}
-
-RenderViewHost* WebUI::GetRenderViewHost() const {
-  DCHECK(tab_contents());
-  return tab_contents()->render_view_host();
-}
-
 bool WebUI::IsLoading() const {
   std::vector<WebUIMessageHandler*>::const_iterator iter;
   for (iter = handlers_.begin(); iter != handlers_.end(); ++iter) {
     if ((*iter)->IsLoading())
       return true;
   }
   return false;
 }
 
 // WebUI, protected: ----------------------------------------------------------
 
 void WebUI::AddMessageHandler(WebUIMessageHandler* handler) {
   handlers_.push_back(handler);
 }
 
 void WebUI::ExecuteJavascript(const string16& javascript) {
-  GetRenderViewHost()->ExecuteJavascriptInWebFrame(string16(),
-                                                   javascript);
+  tab_contents_->render_view_host()->ExecuteJavascriptInWebFrame(string16(),
+                                                                 javascript);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // WebUIMessageHandler
 WebUIMessageHandler::WebUIMessageHandler() : web_ui_(NULL) {
 }
 
 WebUIMessageHandler::~WebUIMessageHandler() {
 }
 
@@ skipping 44 matching lines @@
   return false;
 }
 
 string16 WebUIMessageHandler::ExtractStringValue(const ListValue* value) {
   string16 string16_value;
   if (value->GetString(0, &string16_value))
     return string16_value;
   NOTREACHED();
   return string16();
 }