Add ChromeRenderViewHostTestHarness to get rid of the dependency from RVHTH to profile

BUG=90443
TEST=everything still works

Review URL: http://codereview.chromium.org/7892007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101037 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 11 insertions, 11 deletions

diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
index ef8faf7..67f9af9 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
@@ -27,7 +27,7 @@ class ContentSettingBubbleModelTest : public TabContentsWrapperTestHarness {
                               bool expect_reload_hint) {
     scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
         ContentSettingBubbleModel::CreateContentSettingBubbleModel(
-            NULL, contents_wrapper(), profile_.get(),
+            NULL, contents_wrapper(), profile(),
             CONTENT_SETTINGS_TYPE_GEOLOCATION));
     const ContentSettingBubbleModel::BubbleContent& bubble_content =
         content_setting_bubble_model->bubble_content();
@@ -52,7 +52,7 @@ TEST_F(ContentSettingBubbleModelTest, ImageRadios) {
 
   scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
-         NULL, contents_wrapper(), profile_.get(),
+         NULL, contents_wrapper(), profile(),
          CONTENT_SETTINGS_TYPE_IMAGES));
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model->bubble_content();
@@ -71,7 +71,7 @@ TEST_F(ContentSettingBubbleModelTest, Cookies) {
 
   scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
-         NULL, contents_wrapper(), profile_.get(),
+         NULL, contents_wrapper(), profile(),
          CONTENT_SETTINGS_TYPE_COOKIES));
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model->bubble_content();
@@ -90,7 +90,7 @@ TEST_F(ContentSettingBubbleModelTest, Plugins) {
 
   scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
-         NULL, contents_wrapper(), profile_.get(),
+         NULL, contents_wrapper(), profile(),
          CONTENT_SETTINGS_TYPE_PLUGINS));
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model->bubble_content();
@@ -107,7 +107,7 @@ TEST_F(ContentSettingBubbleModelTest, MultiplePlugins) {
   cmd->AppendSwitch(switches::kEnableResourceContentSettings);
   cmd->AppendSwitch(switches::kEnableClickToPlay);
 
-  HostContentSettingsMap* map = profile_->GetHostContentSettingsMap();
+  HostContentSettingsMap* map = profile()->GetHostContentSettingsMap();
   std::string fooPlugin = "foo";
   std::string barPlugin = "bar";
 
@@ -135,7 +135,7 @@ TEST_F(ContentSettingBubbleModelTest, MultiplePlugins) {
 
   scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
-          NULL, contents_wrapper(), profile_.get(),
+          NULL, contents_wrapper(), profile(),
           CONTENT_SETTINGS_TYPE_PLUGINS));
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model->bubble_content();
@@ -184,7 +184,7 @@ TEST_F(ContentSettingBubbleModelTest, Geolocation) {
 
   // Add it to the content map, should now have a clear link.
   HostContentSettingsMap* setting_map =
-      profile_->GetHostContentSettingsMap();
+      profile()->GetHostContentSettingsMap();
   setting_map->SetContentSetting(
       ContentSettingsPattern::FromURLNoWildcard(frame1_url),
       ContentSettingsPattern::FromURLNoWildcard(page_url),
@@ -194,7 +194,7 @@ TEST_F(ContentSettingBubbleModelTest, Geolocation) {
   CheckGeolocationBubble(1, true, false);
 
   // Change the default to allow: no message needed.
-  profile_->GetHostContentSettingsMap()->SetDefaultContentSetting(
+  profile()->GetHostContentSettingsMap()->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_GEOLOCATION, CONTENT_SETTING_ALLOW);
   CheckGeolocationBubble(1, false, false);
 
@@ -203,7 +203,7 @@ TEST_F(ContentSettingBubbleModelTest, Geolocation) {
   CheckGeolocationBubble(2, false, true);
 
   // Change the default to block: offer a clear link for the persisted frame 1.
-  profile_->GetHostContentSettingsMap()->SetDefaultContentSetting(
+  profile()->GetHostContentSettingsMap()->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_GEOLOCATION, CONTENT_SETTING_BLOCK);
   CheckGeolocationBubble(2, true, false);
 }
@@ -213,7 +213,7 @@ TEST_F(ContentSettingBubbleModelTest, FileURL) {
   NavigateAndCommit(GURL(file_url));
   scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
-          NULL, contents_wrapper(), profile_.get(),
+          NULL, contents_wrapper(), profile(),
           CONTENT_SETTINGS_TYPE_IMAGES));
   std::string title =
       content_setting_bubble_model->bubble_content().radio_group.radio_items[0];
diff --git a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc
index 785ea44..e2c50a9 100644
--- a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc
+++ b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc
@@ -49,7 +49,7 @@ TEST_F(ContentSettingImageModelTest, UpdateFromTabContents) {
 TEST_F(ContentSettingImageModelTest, CookieAccessed) {
   TabSpecificContentSettings* content_settings =
       contents_wrapper()->content_settings();
-  profile_->GetHostContentSettingsMap()->SetDefaultContentSetting(
+  profile()->GetHostContentSettingsMap()->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_COOKIES, CONTENT_SETTING_BLOCK);
   scoped_ptr<ContentSettingImageModel> content_setting_image_model(
      ContentSettingImageModel::CreateContentSettingImageModel(