| Index: chrome/browser/search/hotword_service_unittest.cc
|
| diff --git a/chrome/browser/search/hotword_service_unittest.cc b/chrome/browser/search/hotword_service_unittest.cc
|
| index be9c240b432213b36e54cc8cfdf43383aa29d286..18191f16692049ef9096e4d016cb3c7e9391a0de 100644
|
| --- a/chrome/browser/search/hotword_service_unittest.cc
|
| +++ b/chrome/browser/search/hotword_service_unittest.cc
|
| @@ -117,13 +117,10 @@ TEST_P(HotwordServiceTest, IsHotwordAllowedBadFieldTrial) {
|
| TestingProfile::Builder profile_builder;
|
| scoped_ptr<TestingProfile> profile = profile_builder.Build();
|
|
|
| - HotwordServiceFactory* hotword_service_factory =
|
| - HotwordServiceFactory::GetInstance();
|
| -
|
| // Check that the service exists so that a NULL service be ruled out in
|
| // following tests.
|
| HotwordService* hotword_service =
|
| - hotword_service_factory->GetForProfile(profile.get());
|
| + HotwordServiceFactory::GetInstance()->GetForProfile(profile.get());
|
| EXPECT_TRUE(hotword_service != NULL);
|
|
|
| // When the field trial is empty or Disabled, it should not be allowed.
|
| @@ -154,13 +151,10 @@ TEST_P(HotwordServiceTest, IsHotwordAllowedLocale) {
|
| TestingProfile::Builder profile_builder;
|
| scoped_ptr<TestingProfile> profile = profile_builder.Build();
|
|
|
| - HotwordServiceFactory* hotword_service_factory =
|
| - HotwordServiceFactory::GetInstance();
|
| -
|
| // Check that the service exists so that a NULL service be ruled out in
|
| // following tests.
|
| HotwordService* hotword_service =
|
| - hotword_service_factory->GetForProfile(profile.get());
|
| + HotwordServiceFactory::GetInstance()->GetForProfile(profile.get());
|
| EXPECT_TRUE(hotword_service != NULL);
|
|
|
| // Set the field trial to a valid one.
|
| @@ -194,10 +188,8 @@ TEST_P(HotwordServiceTest, AudioLoggingPrefSetCorrectly) {
|
| TestingProfile::Builder profile_builder;
|
| scoped_ptr<TestingProfile> profile = profile_builder.Build();
|
|
|
| - HotwordServiceFactory* hotword_service_factory =
|
| - HotwordServiceFactory::GetInstance();
|
| HotwordService* hotword_service =
|
| - hotword_service_factory->GetForProfile(profile.get());
|
| + HotwordServiceFactory::GetInstance()->GetForProfile(profile.get());
|
| EXPECT_TRUE(hotword_service != NULL);
|
|
|
| // If it's a fresh profile, although the default value is true,
|
|
|