Index: chrome/browser/themes/theme_syncable_service_unittest.cc |
diff --git a/chrome/browser/themes/theme_syncable_service_unittest.cc b/chrome/browser/themes/theme_syncable_service_unittest.cc |
index be32f67de8c83332afc53b7191460b70a67df8f2..3ff419526713bb385cdbb8210c748918dda70af6 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) { |