Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4456)

Unified Diff: chrome/browser/ui/prefs/prefs_tab_helper_unittest.cc

Issue 9838050: Remove per-tab preference machinery. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: should be kWebKitGlobalJavascriptEnabled Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/prefs/prefs_tab_helper.cc ('k') | chrome/browser/ui/tab_contents/tab_contents_wrapper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/prefs/prefs_tab_helper_unittest.cc
diff --git a/chrome/browser/ui/prefs/prefs_tab_helper_unittest.cc b/chrome/browser/ui/prefs/prefs_tab_helper_unittest.cc
deleted file mode 100644
index e32cde3b9c3342d8f40bba552056def4a9b6150c..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/prefs/prefs_tab_helper_unittest.cc
+++ /dev/null
@@ -1,234 +0,0 @@
-// 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/common/pref_names.h"
-#include "chrome/browser/prefs/pref_service.h"
-#include "chrome/browser/ui/prefs/prefs_tab_helper.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
-#include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h"
-#include "content/test/test_browser_thread.h"
-
-using content::BrowserThread;
-using content::WebContents;
-
-class TestPrefsTabHelper : public PrefsTabHelper {
- public:
- explicit TestPrefsTabHelper(WebContents* web_contents)
- : PrefsTabHelper(web_contents),
- was_update_web_preferences_called_(false) {
- }
- virtual ~TestPrefsTabHelper() { }
-
- virtual void UpdateWebPreferences() OVERRIDE {
- was_update_web_preferences_called_ = true;
- PrefsTabHelper::UpdateWebPreferences();
- }
-
- void NotifyRenderViewCreated() {
- RenderViewCreated(NULL);
- }
-
- bool was_update_web_preferences_called() {
- return was_update_web_preferences_called_;
- }
-
- private:
- bool was_update_web_preferences_called_;
-};
-
-class PrefsTabHelperTest : public TabContentsWrapperTestHarness {
- public:
- PrefsTabHelperTest()
- : TabContentsWrapperTestHarness(),
- ui_thread_(BrowserThread::UI, &message_loop_) {}
-
- virtual ~PrefsTabHelperTest() {}
-
- TabContentsWrapper* contents_wrapper2() {
- return contents_wrapper2_.get();
- }
-
- TestPrefsTabHelper* CreateTestPrefsTabHelper() {
- TestPrefsTabHelper* test_prefs_helper =
- new TestPrefsTabHelper(contents_wrapper()->web_contents());
- contents_wrapper()->prefs_tab_helper_.reset(test_prefs_helper);
- return test_prefs_helper;
- }
-
- void SetContents2(WebContents* contents) {
- contents_wrapper2_.reset(
- contents ? new TabContentsWrapper(contents) : NULL);
- }
-
- void TestBooleanPreference(const char* key) {
- PrefService* prefs1 =
- contents_wrapper()->prefs_tab_helper()->per_tab_prefs();
- PrefService* prefs2 =
- contents_wrapper2()->prefs_tab_helper()->per_tab_prefs();
- const bool initial_value = prefs1->GetBoolean(key);
- EXPECT_EQ(initial_value, prefs2->GetBoolean(key));
-
- prefs1->SetBoolean(key, !initial_value);
- EXPECT_EQ(!initial_value, prefs1->GetBoolean(key));
- EXPECT_EQ(initial_value, prefs2->GetBoolean(key));
-
- prefs1->SetBoolean(key, initial_value);
- EXPECT_EQ(initial_value, prefs1->GetBoolean(key));
- EXPECT_EQ(initial_value, prefs2->GetBoolean(key));
-
- prefs2->SetBoolean(key, !initial_value);
- EXPECT_EQ(initial_value, prefs1->GetBoolean(key));
- EXPECT_EQ(!initial_value, prefs2->GetBoolean(key));
-
- prefs1->SetBoolean(key, !initial_value);
- EXPECT_EQ(!initial_value, prefs1->GetBoolean(key));
- EXPECT_EQ(!initial_value, prefs2->GetBoolean(key));
- }
-
- void TestIntegerPreference(const char* key) {
- PrefService* prefs1 =
- contents_wrapper()->prefs_tab_helper()->per_tab_prefs();
- PrefService* prefs2 =
- contents_wrapper2()->prefs_tab_helper()->per_tab_prefs();
- const int initial_value = prefs1->GetInteger(key);
- EXPECT_EQ(initial_value, prefs2->GetInteger(key));
-
- const int modified_value = initial_value + 1;
- prefs1->SetInteger(key, modified_value);
- EXPECT_EQ(modified_value, prefs1->GetInteger(key));
- EXPECT_EQ(initial_value, prefs2->GetInteger(key));
-
- prefs1->SetInteger(key, initial_value);
- EXPECT_EQ(initial_value, prefs1->GetInteger(key));
- EXPECT_EQ(initial_value, prefs2->GetInteger(key));
-
- prefs2->SetInteger(key, modified_value);
- EXPECT_EQ(initial_value, prefs1->GetInteger(key));
- EXPECT_EQ(modified_value, prefs2->GetInteger(key));
-
- prefs1->SetInteger(key, modified_value);
- EXPECT_EQ(modified_value, prefs1->GetInteger(key));
- EXPECT_EQ(modified_value, prefs2->GetInteger(key));
- }
-
- void TestStringPreference(const char* key) {
- PrefService* prefs1 =
- contents_wrapper()->prefs_tab_helper()->per_tab_prefs();
- PrefService* prefs2 =
- contents_wrapper2()->prefs_tab_helper()->per_tab_prefs();
- const std::string initial_value = prefs1->GetString(key);
- EXPECT_EQ(initial_value, prefs2->GetString(key));
-
- const std::string modified_value = initial_value + "_";
- prefs1->SetString(key, modified_value);
- EXPECT_EQ(modified_value, prefs1->GetString(key));
- EXPECT_EQ(initial_value, prefs2->GetString(key));
-
- prefs1->SetString(key, initial_value);
- EXPECT_EQ(initial_value, prefs1->GetString(key));
- EXPECT_EQ(initial_value, prefs2->GetString(key));
-
- prefs2->SetString(key, modified_value);
- EXPECT_EQ(initial_value, prefs1->GetString(key));
- EXPECT_EQ(modified_value, prefs2->GetString(key));
-
- prefs1->SetString(key, modified_value);
- EXPECT_EQ(modified_value, prefs1->GetString(key));
- EXPECT_EQ(modified_value, prefs2->GetString(key));
- }
-
- protected:
- virtual void SetUp() OVERRIDE {
- TabContentsWrapperTestHarness::SetUp();
- SetContents2(CreateTestWebContents());
- }
-
- virtual void TearDown() OVERRIDE {
- contents_wrapper2_.reset();
- TabContentsWrapperTestHarness::TearDown();
- }
-
- private:
- content::TestBrowserThread ui_thread_;
- scoped_ptr<TabContentsWrapper> contents_wrapper2_;
-
- DISALLOW_COPY_AND_ASSIGN(PrefsTabHelperTest);
-};
-
-TEST_F(PrefsTabHelperTest, PerTabJavaScriptEnabled) {
- TestBooleanPreference(prefs::kWebKitJavascriptEnabled);
-}
-
-TEST_F(PrefsTabHelperTest, PerTabJavascriptCanOpenWindowsAutomatically) {
- TestBooleanPreference(prefs::kWebKitJavascriptCanOpenWindowsAutomatically);
-}
-
-TEST_F(PrefsTabHelperTest, PerTabLoadsImagesAutomatically) {
- TestBooleanPreference(prefs::kWebKitLoadsImagesAutomatically);
-}
-
-TEST_F(PrefsTabHelperTest, PerTabPluginsEnabled) {
- TestBooleanPreference(prefs::kWebKitPluginsEnabled);
-}
-
-TEST_F(PrefsTabHelperTest, PerTabDefaultFontSize) {
- TestIntegerPreference(prefs::kWebKitDefaultFontSize);
-}
-
-TEST_F(PrefsTabHelperTest, PerTabDefaultFixedFontSize) {
- TestIntegerPreference(prefs::kWebKitDefaultFixedFontSize);
-}
-
-TEST_F(PrefsTabHelperTest, PerTabMinimumFontSize) {
- TestIntegerPreference(prefs::kWebKitMinimumFontSize);
-}
-
-TEST_F(PrefsTabHelperTest, PerTabMinimumLogicalFontSize) {
- TestIntegerPreference(prefs::kWebKitMinimumLogicalFontSize);
-}
-
-TEST_F(PrefsTabHelperTest, PerTabDefaultCharset) {
- TestStringPreference(prefs::kDefaultCharset);
-}
-
-TEST_F(PrefsTabHelperTest, PerTabDefaultCharsetUpdate) {
- TestPrefsTabHelper* test_prefs_helper = CreateTestPrefsTabHelper();
- EXPECT_FALSE(test_prefs_helper->was_update_web_preferences_called());
- const char* pref = prefs::kDefaultCharset;
- PrefService* prefs =
- contents_wrapper()->prefs_tab_helper()->per_tab_prefs();
- prefs->SetString(pref, prefs->GetString(pref) + "_");
- EXPECT_TRUE(test_prefs_helper->was_update_web_preferences_called());
-}
-
-TEST_F(PrefsTabHelperTest, PerTabStandardFontFamily) {
- TestStringPreference(prefs::kWebKitStandardFontFamily);
-}
-
-TEST_F(PrefsTabHelperTest, PerTabFixedFontFamily) {
- TestStringPreference(prefs::kWebKitFixedFontFamily);
-}
-
-TEST_F(PrefsTabHelperTest, PerTabSerifFontFamily) {
- TestStringPreference(prefs::kWebKitSerifFontFamily);
-}
-
-TEST_F(PrefsTabHelperTest, PerTabSansSerifFontFamily) {
- TestStringPreference(prefs::kWebKitSansSerifFontFamily);
-}
-
-TEST_F(PrefsTabHelperTest, PerTabCursiveFontFamily) {
- TestStringPreference(prefs::kWebKitCursiveFontFamily);
-}
-
-TEST_F(PrefsTabHelperTest, PerTabFantasyFontFamily) {
- TestStringPreference(prefs::kWebKitFantasyFontFamily);
-}
-
-TEST_F(PrefsTabHelperTest, OverridePrefsOnViewCreation) {
- TestPrefsTabHelper* test_prefs_helper = CreateTestPrefsTabHelper();
- EXPECT_FALSE(test_prefs_helper->was_update_web_preferences_called());
- test_prefs_helper->NotifyRenderViewCreated();
- EXPECT_TRUE(test_prefs_helper->was_update_web_preferences_called());
-}
« no previous file with comments | « chrome/browser/ui/prefs/prefs_tab_helper.cc ('k') | chrome/browser/ui/tab_contents/tab_contents_wrapper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698