Remove any platform specific code from the chrome/browser/website_settings.* .

chrome/browser/ui/website_settings/website_settings_unittest.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/browser/website_settings.h"
+#include "chrome/browser/ui/website_settings/website_settings.h"
 
 #include "base/at_exit.h"
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
-#include "chrome/browser/ui/website_settings_ui.h"
+#include "chrome/browser/ui/website_settings/website_settings_ui.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/cert_store.h"
 #include "content/public/common/ssl_status.h"
 #include "content/test/test_browser_thread.h"
 #include "net/base/cert_status_flags.h"
 #include "net/base/ssl_connection_status_flags.h"
 #include "net/base/test_certificate_data.h"
@@ skipping 26 matching lines @@
 class MockCertStore : public content::CertStore {
  public:
   virtual ~MockCertStore() {}
   MOCK_METHOD2(StoreCert, int(net::X509Certificate*, int));
   MOCK_METHOD2(RetrieveCert, bool(int, scoped_refptr<net::X509Certificate>*));
 };
 
 class MockWebsiteSettingsUI : public WebsiteSettingsUI {
  public:
   virtual ~MockWebsiteSettingsUI() {}
-  MOCK_METHOD1(SetPresenter, void(WebsiteSettings* presenter));
   MOCK_METHOD1(SetCookieInfo, void(const CookieInfoList& cookie_info_list));
   MOCK_METHOD1(SetPermissionInfo,
                void(const PermissionInfoList& permission_info_list));
   MOCK_METHOD1(SetIdentityInfo, void(const IdentityInfo& identity_info));
   MOCK_METHOD1(SetFirstVisit, void(const string16& first_visit));
 };
 
 class WebsiteSettingsTest : public ChromeRenderViewHostTestHarness {
  public:
   WebsiteSettingsTest()
@@ skipping 25 matching lines @@
 
     tab_specific_content_settings_.reset(
         new TabSpecificContentSettings(contents()));
 
     // Setup the mock cert store.
     EXPECT_CALL(cert_store_, RetrieveCert(cert_id_, _) )
         .Times(AnyNumber())
         .WillRepeatedly(DoAll(SetArgPointee<1>(cert_), Return(true)));
 
     // Setup mock ui.
-    mock_ui_ = new MockWebsiteSettingsUI();
+    mock_ui_.reset(new MockWebsiteSettingsUI());
   }
 
   virtual void TearDown() {
-    ASSERT_TRUE(website_settings_) << "No WebsiteSettings instance created.";
-    // Call OnUIClosing to destroy the |website_settings| object.
-    EXPECT_CALL(*mock_ui_, SetPresenter(NULL));
-    website_settings_->OnUIClosing();
+    ASSERT_TRUE(website_settings_.get())
+        << "No WebsiteSettings instance created.";
     RenderViewHostTestHarness::TearDown();
+    website_settings_.reset(NULL);

[tfarina, 2012/06/03 16:22:24]

nit: website_settings_.reset();

[markusheintz_, 2012/06/04 16:33:54]

Done.

   }
 
   void SetDefaultUIExpectations(MockWebsiteSettingsUI* mock_ui) {
     // During creation |WebsiteSettings| makes the following calls to the ui.
     EXPECT_CALL(*mock_ui, SetPermissionInfo(_));
     EXPECT_CALL(*mock_ui, SetIdentityInfo(_));
-    EXPECT_CALL(*mock_ui, SetPresenter(_));
     EXPECT_CALL(*mock_ui, SetCookieInfo(_));
     EXPECT_CALL(*mock_ui, SetFirstVisit(string16()));
   }
 
   const GURL& url() const { return url_; }
   MockCertStore* cert_store() { return &cert_store_; }
   int cert_id() { return cert_id_; }
-  MockWebsiteSettingsUI* mock_ui() { return mock_ui_; }
+  MockWebsiteSettingsUI* mock_ui() { return mock_ui_.get(); }
   const SSLStatus& ssl() { return ssl_; }
   TabSpecificContentSettings* tab_specific_content_settings() {
     return tab_specific_content_settings_.get();
   }
 
   WebsiteSettings* website_settings() {
-    if (!website_settings_) {
-      website_settings_ = new WebsiteSettings(
+    if (!website_settings_.get()) {
+      website_settings_.reset(new WebsiteSettings(
           mock_ui(), profile(), tab_specific_content_settings_.get(), url(),
-          ssl(), cert_store());
+          ssl(), cert_store()));
     }
-    return website_settings_;
+    return website_settings_.get();
   }
 
   SSLStatus ssl_;
 
  private:
-  // The |Website_settings| object deletes itself after the OnUIClosing()
-  // method is called.
-  WebsiteSettings* website_settings_;  // Weak pointer.
+  scoped_ptr<WebsiteSettings> website_settings_;
   // The UI is owned by |web_site_settings_|.

[tfarina, 2012/06/03 16:22:24]

nit: Is this comment still valid?

[markusheintz_, 2012/06/04 16:33:54]

Sorry of course not. Removed.

-  MockWebsiteSettingsUI* mock_ui_;  // Weak pointer.
+  scoped_ptr<MockWebsiteSettingsUI> mock_ui_;
   int cert_id_;
   scoped_refptr<net::X509Certificate> cert_;
   content::TestBrowserThread browser_thread_;
   scoped_ptr<TabSpecificContentSettings> tab_specific_content_settings_;
   MockCertStore cert_store_;
   GURL url_;
 };
 
 }  // namespace
 
@@ skipping 37 matching lines @@
       url(), url(), CONTENT_SETTINGS_TYPE_GEOLOCATION, "");
   EXPECT_EQ(setting, CONTENT_SETTING_ALLOW);
   setting = content_settings->GetContentSetting(
       url(), url(), CONTENT_SETTINGS_TYPE_NOTIFICATIONS, "");
   EXPECT_EQ(setting, CONTENT_SETTING_ALLOW);
 }
 
 TEST_F(WebsiteSettingsTest, OnSiteDataAccessed) {
   EXPECT_CALL(*mock_ui(), SetPermissionInfo(_));
   EXPECT_CALL(*mock_ui(), SetIdentityInfo(_));
-  EXPECT_CALL(*mock_ui(), SetPresenter(_));
   EXPECT_CALL(*mock_ui(), SetFirstVisit(string16()));
   EXPECT_CALL(*mock_ui(), SetCookieInfo(_)).Times(2);
 
   website_settings()->OnSiteDataAccessed();
 }
 
 TEST_F(WebsiteSettingsTest, HTTPConnection) {
   SetDefaultUIExpectations(mock_ui());
   EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_UNENCRYPTED,
             website_settings()->site_connection_status());
@@ skipping 99 matching lines @@
   ssl_.connection_status = status;
 
   SetDefaultUIExpectations(mock_ui());
 
   EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED_ERROR,
             website_settings()->site_connection_status());
   EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_CERT,
             website_settings()->site_identity_status());
   EXPECT_EQ(string16(), website_settings()->organization_name());
 }