Removal of Profile from content part 1.

content/browser/tab_contents/tab_contents.h

 // 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_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 #define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 #pragma once
 
 #include <deque>
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/string16.h"
+#include "chrome/browser/profiles/profile.h"
 #include "content/browser/download/save_package.h"
 #include "content/browser/javascript_dialogs.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/tab_contents/constrained_window.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/page_navigator.h"
 #include "content/browser/tab_contents/render_view_host_manager.h"
 #include "content/browser/tab_contents/tab_contents_observer.h"
 #include "content/browser/webui/web_ui.h"
 #include "content/common/property_bag.h"
 #include "content/common/renderer_preferences.h"
 #include "net/base/load_states.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_handle.h"
 #endif
 
 namespace gfx {
 class Rect;
 }
 
 class DownloadItem;
 class LoadNotificationDetails;
-class Profile;
 struct RendererPreferences;
 class RenderViewHost;
 class SessionStorageNamespace;
 class SiteInstance;
 class SkBitmap;
 class TabContentsDelegate;
 class TabContentsObserver;
 class TabContentsView;
 struct ThumbnailScore;
 class URLPattern;
@@ skipping 19 matching lines @@
     INVALIDATE_TITLE           = 1 << 4,  // The title changed.
   };
 
   // |base_tab_contents| is used if we want to size the new tab contents view
   // based on an existing tab contents view.  This can be NULL if not needed.
   //
   // The session storage namespace parameter allows multiple render views and
   // tab contentses to share the same session storage (part of the WebStorage
   // spec) space. This is useful when restoring tabs, but most callers should
   // pass in NULL which will cause a new SessionStorageNamespace to be created.
-  TabContents(Profile* profile,
+  TabContents(content::BrowserContext* browser_context,
               SiteInstance* site_instance,
               int routing_id,
               const TabContents* base_tab_contents,
               SessionStorageNamespace* session_storage_namespace);
   virtual ~TabContents();
 
   // Intrinsic tab state -------------------------------------------------------
 
   // Returns the property bag for this tab contents, where callers can add
   // extra data they may wish to associate with the tab. Returns a pointer
   // rather than a reference since the PropertyAccessors expect this.
   const PropertyBag* property_bag() const { return &property_bag_; }
   PropertyBag* property_bag() { return &property_bag_; }
 
   TabContentsDelegate* delegate() const { return delegate_; }
   void set_delegate(TabContentsDelegate* delegate);
 
   // Gets the controller for this tab contents.
   NavigationController& controller() { return controller_; }
   const NavigationController& controller() const { return controller_; }
 
-  // Returns the user profile associated with this TabContents (via the
+  // Returns the user context associated with this TabContents (via the

[jam, 2011/07/22 16:58:38]

nit: browser_context

   // NavigationController).
-  Profile* profile() const { return controller_.profile(); }
+  content::BrowserContext* browser_context() const {
+    return controller_.browser_context();
+  }
+
+  // Returns the profile.
+  // TEMPORARY; http://crbug.com/76788
+  Profile* profile() const { return static_cast<Profile*>(browser_context()); }
 
   // Returns the SavePackage which manages the page saving job. May be NULL.
   SavePackage* save_package() const { return save_package_.get(); }
 
   // Return the currently active RenderProcessHost and RenderViewHost. Each of
   // these may change over time.
   RenderProcessHost* GetRenderProcessHost() const;
   RenderViewHost* render_view_host() const {
     return render_manager_.current_host();
   }
@@ skipping 538 matching lines @@
   virtual void RunJavaScriptMessage(const RenderViewHost* rvh,
                                     const string16& message,
                                     const string16& default_prompt,
                                     const GURL& frame_url,
                                     const int flags,
                                     IPC::Message* reply_msg,
                                     bool* did_suppress_message) OVERRIDE;
   virtual void RunBeforeUnloadConfirm(const RenderViewHost* rvh,
                                       const string16& message,
                                       IPC::Message* reply_msg);
-  virtual RendererPreferences GetRendererPrefs(Profile* profile) const;
+  virtual RendererPreferences GetRendererPrefs(
+      content::BrowserContext* context) const OVERRIDE;

[jam, 2011/07/22 16:58:38]

nit: browser_context

   virtual WebPreferences GetWebkitPrefs();
   virtual void OnUserGesture();
   virtual void OnIgnoredUIEvent();
   virtual void OnCrossSiteResponse(int new_render_process_host_id,
                                    int new_request_id);
   virtual void RendererUnresponsive(RenderViewHost* render_view_host,
                                     bool is_during_unload);
   virtual void RendererResponsive(RenderViewHost* render_view_host);
   virtual void LoadStateChanged(const GURL& url, net::LoadState load_state,
                                 uint64 upload_position, uint64 upload_size);
@@ skipping 164 matching lines @@
   ObserverList<TabContentsObserver> observers_;
 
   // Content restrictions, used to disable print/copy etc based on content's
   // (full-page plugins for now only) permissions.
   int content_restrictions_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContents);
 };
 
 #endif  // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_