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

Unified Diff: chrome/browser/protector/session_startup_change_unittest.cc

Issue 11493003: Remove the protector service. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix implicit ExtensionSystem -> TemplateURLService dependency Created 8 years 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
Index: chrome/browser/protector/session_startup_change_unittest.cc
diff --git a/chrome/browser/protector/session_startup_change_unittest.cc b/chrome/browser/protector/session_startup_change_unittest.cc
deleted file mode 100644
index 38de32ccd0fdcc9d634abab10a1e5f3eb055f5f3..0000000000000000000000000000000000000000
--- a/chrome/browser/protector/session_startup_change_unittest.cc
+++ /dev/null
@@ -1,191 +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 "base/memory/scoped_ptr.h"
-#include "base/utf_string_conversions.h"
-#include "base/values.h"
-#include "chrome/browser/prefs/session_startup_pref.h"
-#include "chrome/browser/protector/base_setting_change.h"
-#include "chrome/browser/ui/startup/startup_tab.h"
-#include "chrome/test/base/testing_profile.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "grit/generated_resources.h"
-#include "ui/base/l10n/l10n_util.h"
-
-namespace protector {
-
-namespace {
-
-const char kStartupUrl1[] = "http://google.com";
-const char kStartupUrl2[] = "http://example.com";
-const char kStartupUrl3[] = "http://example.org";
-const char kStartupHost1[] = "google.com";
-const char kStartupHost2[] = "example.com";
-const char kStartupHost3[] = "example.org";
-
-const BaseSettingChange::DisplayName kNoDisplayName(
- BaseSettingChange::kDefaultNamePriority, string16());
-
-} // namespace
-
-class SessionStartupChangeTest : public testing::Test {
- public:
- SessionStartupChangeTest()
- : initial_startup_pref_(SessionStartupPref::DEFAULT) {
- }
-
- virtual void SetUp() OVERRIDE {
- // Ensure initial session startup pref.
- SessionStartupPref::SetStartupPref(&profile_, initial_startup_pref_);
- }
-
- protected:
- TestingProfile profile_;
- SessionStartupPref initial_startup_pref_;
- StartupTabs empty_pinned_tabs_;
-};
-
-TEST_F(SessionStartupChangeTest, InitAndApply) {
- // Create a change and apply it.
- SessionStartupPref backup_startup_pref(SessionStartupPref::LAST);
- scoped_ptr<BaseSettingChange> change(
- CreateSessionStartupChange(initial_startup_pref_, empty_pinned_tabs_,
- backup_startup_pref, empty_pinned_tabs_));
- ASSERT_TRUE(change->Init(&profile_));
- // Setting is initially reverted to backup.
- EXPECT_EQ(SessionStartupPref::LAST,
- SessionStartupPref::GetStartupPref(&profile_).type);
- change->Apply(NULL); // |browser| is unused.
- // New setting active now.
- EXPECT_EQ(SessionStartupPref::DEFAULT,
- SessionStartupPref::GetStartupPref(&profile_).type);
-}
-
-TEST_F(SessionStartupChangeTest, InitAndDiscard) {
- // Create a change and discard it.
- SessionStartupPref backup_startup_pref(SessionStartupPref::LAST);
- scoped_ptr<BaseSettingChange> change(
- CreateSessionStartupChange(initial_startup_pref_, empty_pinned_tabs_,
- backup_startup_pref, empty_pinned_tabs_));
- ASSERT_TRUE(change->Init(&profile_));
- // Setting is initially reverted to backup.
- EXPECT_EQ(SessionStartupPref::LAST,
- SessionStartupPref::GetStartupPref(&profile_).type);
- change->Discard(NULL); // |browser| is unused.
- // Nothing changed by Discard.
- EXPECT_EQ(SessionStartupPref::LAST,
- SessionStartupPref::GetStartupPref(&profile_).type);
-}
-
-TEST_F(SessionStartupChangeTest, ApplyButtonCaptions) {
- // Apply button captions for "Open NTP" and "Open specific URLs" cases.
- string16 open_ntp_caption =
- l10n_util::GetStringUTF16(IDS_CHANGE_STARTUP_SETTINGS_NTP);
- string16 open_url1_etc_caption =
- l10n_util::GetStringFUTF16(IDS_CHANGE_STARTUP_SETTINGS_URLS,
- UTF8ToUTF16(GURL(kStartupUrl1).host()));
- string16 open_url2_etc_caption =
- l10n_util::GetStringFUTF16(IDS_CHANGE_STARTUP_SETTINGS_URLS,
- UTF8ToUTF16(GURL(kStartupUrl2).host()));
- string16 open_url3_etc_caption =
- l10n_util::GetStringFUTF16(IDS_CHANGE_STARTUP_SETTINGS_URLS,
- UTF8ToUTF16(GURL(kStartupUrl3).host()));
-
- // Open NTP.
- initial_startup_pref_.type = SessionStartupPref::DEFAULT;
- SessionStartupPref backup_startup_pref(SessionStartupPref::DEFAULT);
- scoped_ptr<BaseSettingChange> change(
- CreateSessionStartupChange(initial_startup_pref_, empty_pinned_tabs_,
- backup_startup_pref, empty_pinned_tabs_));
- ASSERT_TRUE(change->Init(&profile_));
- EXPECT_EQ(open_ntp_caption, change->GetApplyButtonText());
- EXPECT_EQ(GURL(), change->GetNewSettingURL());
- EXPECT_EQ(kNoDisplayName, change->GetApplyDisplayName());
-
- // Pinned tabs count as startup URLs as well.
- StartupTabs new_pinned_tabs;
- StartupTab pinned_tab;
- pinned_tab.url = GURL(kStartupUrl3);
- new_pinned_tabs.push_back(pinned_tab);
- change.reset(
- CreateSessionStartupChange(initial_startup_pref_, new_pinned_tabs,
- backup_startup_pref, empty_pinned_tabs_));
- ASSERT_TRUE(change->Init(&profile_));
- EXPECT_EQ(open_url3_etc_caption, change->GetApplyButtonText());
- EXPECT_EQ(GURL(kStartupUrl3), change->GetNewSettingURL());
- EXPECT_EQ(UTF8ToUTF16(kStartupHost3), change->GetApplyDisplayName().second);
-
- // "Open URLs" with no URLs is the same as "Open NTP".
- initial_startup_pref_.type = SessionStartupPref::URLS;
- change.reset(
- CreateSessionStartupChange(initial_startup_pref_, empty_pinned_tabs_,
- backup_startup_pref, empty_pinned_tabs_));
- ASSERT_TRUE(change->Init(&profile_));
- EXPECT_EQ(open_ntp_caption, change->GetApplyButtonText());
- EXPECT_EQ(GURL(), change->GetNewSettingURL());
- EXPECT_EQ(kNoDisplayName, change->GetApplyDisplayName());
-
- // Single URL.
- initial_startup_pref_.urls.push_back(GURL(kStartupUrl1));
- change.reset(
- CreateSessionStartupChange(initial_startup_pref_, empty_pinned_tabs_,
- backup_startup_pref, empty_pinned_tabs_));
- ASSERT_TRUE(change->Init(&profile_));
- EXPECT_EQ(open_url1_etc_caption, change->GetApplyButtonText());
- EXPECT_EQ(GURL(kStartupUrl1), change->GetNewSettingURL());
- EXPECT_EQ(UTF8ToUTF16(kStartupHost1), change->GetApplyDisplayName().second);
-
- // Multiple URLs: name of the first one used.
- initial_startup_pref_.urls.push_back(GURL(kStartupUrl2));
- change.reset(
- CreateSessionStartupChange(initial_startup_pref_, empty_pinned_tabs_,
- backup_startup_pref, empty_pinned_tabs_));
- ASSERT_TRUE(change->Init(&profile_));
- EXPECT_EQ(open_url1_etc_caption, change->GetApplyButtonText());
- EXPECT_EQ(GURL(kStartupUrl1), change->GetNewSettingURL());
- EXPECT_EQ(UTF8ToUTF16(kStartupHost1), change->GetApplyDisplayName().second);
-
- // Pinned tabs go after the startup URLs.
- change.reset(
- CreateSessionStartupChange(initial_startup_pref_, new_pinned_tabs,
- backup_startup_pref, empty_pinned_tabs_));
- ASSERT_TRUE(change->Init(&profile_));
- EXPECT_EQ(open_url1_etc_caption, change->GetApplyButtonText());
- EXPECT_EQ(GURL(kStartupUrl1), change->GetNewSettingURL());
- EXPECT_EQ(UTF8ToUTF16(kStartupHost1), change->GetApplyDisplayName().second);
-
- // Multiple URLs, the first present in both backup and new settings.
- backup_startup_pref.type = SessionStartupPref::URLS;
- backup_startup_pref.urls.push_back(GURL(kStartupUrl1));
- change.reset(
- CreateSessionStartupChange(initial_startup_pref_, empty_pinned_tabs_,
- backup_startup_pref, empty_pinned_tabs_));
- ASSERT_TRUE(change->Init(&profile_));
- EXPECT_EQ(open_url2_etc_caption, change->GetApplyButtonText());
- EXPECT_EQ(GURL(kStartupUrl2), change->GetNewSettingURL());
- EXPECT_EQ(UTF8ToUTF16(kStartupHost2), change->GetApplyDisplayName().second);
-
- // Multiple URLs, all present in both backup and new settings: the first one
- // is displayed in that case.
- backup_startup_pref.urls.push_back(GURL(kStartupUrl2));
- change.reset(
- CreateSessionStartupChange(initial_startup_pref_, empty_pinned_tabs_,
- backup_startup_pref, empty_pinned_tabs_));
- ASSERT_TRUE(change->Init(&profile_));
- EXPECT_EQ(open_url1_etc_caption, change->GetApplyButtonText());
- EXPECT_EQ(GURL(kStartupUrl1), change->GetNewSettingURL());
- EXPECT_EQ(UTF8ToUTF16(kStartupHost1), change->GetApplyDisplayName().second);
-
- // Multiple URLs, all present in both backup and new settings, new pinned tabs
- // added: the first pinned tab URL is used.
- change.reset(
- CreateSessionStartupChange(initial_startup_pref_, new_pinned_tabs,
- backup_startup_pref, empty_pinned_tabs_));
- ASSERT_TRUE(change->Init(&profile_));
- EXPECT_EQ(open_url3_etc_caption, change->GetApplyButtonText());
- EXPECT_EQ(GURL(kStartupUrl3), change->GetNewSettingURL());
- EXPECT_EQ(UTF8ToUTF16(kStartupHost3), change->GetApplyDisplayName().second);
-}
-
-} // namespace protector
« no previous file with comments | « chrome/browser/protector/session_startup_change.cc ('k') | chrome/browser/protector/settings_change_global_error.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698