diff options
author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-03 00:10:59 +0000 |
---|---|---|
committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-03 00:10:59 +0000 |
commit | 39790b7f875b20555b97b403975293ea5af5bf79 (patch) | |
tree | ba1364ecc96cfabf92e189c44c3abe6a46813ac4 /chrome/browser/themes/theme_syncable_service_unittest.cc | |
parent | 3b634aed8c7296e80ecbf042266258fadaae3e14 (diff) | |
download | chromium_src-39790b7f875b20555b97b403975293ea5af5bf79.zip chromium_src-39790b7f875b20555b97b403975293ea5af5bf79.tar.gz chromium_src-39790b7f875b20555b97b403975293ea5af5bf79.tar.bz2 |
Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*"
Linux fixes, Part 4 of N
BUG=110610
TBR=darin
Review URL: https://chromiumcodereview.appspot.com/16290004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203648 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/themes/theme_syncable_service_unittest.cc')
-rw-r--r-- | chrome/browser/themes/theme_syncable_service_unittest.cc | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/chrome/browser/themes/theme_syncable_service_unittest.cc b/chrome/browser/themes/theme_syncable_service_unittest.cc index be32f67..3ff4195 100644 --- a/chrome/browser/themes/theme_syncable_service_unittest.cc +++ b/chrome/browser/themes/theme_syncable_service_unittest.cc @@ -107,7 +107,7 @@ class FakeThemeService : public ThemeService { } virtual string GetThemeID() const OVERRIDE { - if (theme_extension_) + if (theme_extension_.get()) return theme_extension_->id(); else return std::string(); @@ -152,7 +152,7 @@ scoped_refptr<extensions::Extension> MakeThemeExtension( extensions::Extension::Create( extension_path, location, source, extensions::Extension::NO_FLAGS, &error); - EXPECT_TRUE(extension); + EXPECT_TRUE(extension.get()); EXPECT_EQ("", error); return extension; } @@ -206,7 +206,7 @@ class ThemeSyncableServiceTest : public testing::Test { new extensions::PermissionSet(empty_set, empty_extent, empty_extent); service->extension_prefs()->AddGrantedPermissions( theme_extension_->id(), permissions.get()); - service->AddExtension(theme_extension_); + service->AddExtension(theme_extension_.get()); ASSERT_EQ(1u, service->extensions()->size()); } @@ -389,8 +389,9 @@ TEST_F(ThemeSyncableServiceTest, UpdateThemeSpecificsFromCurrentTheme) { EXPECT_TRUE(theme_specifics.use_custom_theme()); EXPECT_EQ(theme_extension_->id(), theme_specifics.custom_theme_id()); EXPECT_EQ(theme_extension_->name(), theme_specifics.custom_theme_name()); - EXPECT_EQ(extensions::ManifestURL::GetUpdateURL(theme_extension_).spec(), - theme_specifics.custom_theme_update_url()); + EXPECT_EQ( + extensions::ManifestURL::GetUpdateURL(theme_extension_.get()).spec(), + theme_specifics.custom_theme_update_url()); } TEST_F(ThemeSyncableServiceTest, GetAllSyncData) { @@ -406,8 +407,9 @@ TEST_F(ThemeSyncableServiceTest, GetAllSyncData) { EXPECT_TRUE(theme_specifics.use_custom_theme()); EXPECT_EQ(theme_extension_->id(), theme_specifics.custom_theme_id()); EXPECT_EQ(theme_extension_->name(), theme_specifics.custom_theme_name()); - EXPECT_EQ(extensions::ManifestURL::GetUpdateURL(theme_extension_).spec(), - theme_specifics.custom_theme_update_url()); + EXPECT_EQ( + extensions::ManifestURL::GetUpdateURL(theme_extension_.get()).spec(), + theme_specifics.custom_theme_update_url()); } TEST_F(ThemeSyncableServiceTest, ProcessSyncThemeChange) { @@ -469,8 +471,9 @@ TEST_F(ThemeSyncableServiceTest, OnThemeChangeByUser) { EXPECT_TRUE(change_specifics.use_custom_theme()); EXPECT_EQ(theme_extension_->id(), change_specifics.custom_theme_id()); EXPECT_EQ(theme_extension_->name(), change_specifics.custom_theme_name()); - EXPECT_EQ(extensions::ManifestURL::GetUpdateURL(theme_extension_).spec(), - change_specifics.custom_theme_update_url()); + EXPECT_EQ( + extensions::ManifestURL::GetUpdateURL(theme_extension_.get()).spec(), + change_specifics.custom_theme_update_url()); } TEST_F(ThemeSyncableServiceTest, StopSync) { |