[Hotword] Remove unneeded preferences. Cleaning up look of settings.

chrome/browser/search/hotword_service_factory.cc

 // Copyright 2013 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/browser/search/hotword_service_factory.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/hotword_service.h"
 #include "chrome/common/pref_names.h"
 #include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 
 // static
 HotwordService* HotwordServiceFactory::GetForProfile(Profile* profile) {
-  if (!profile ||
+  if (!profile || profile->IsOffTheRecord() ||

[James Hawkins, 2014/01/24 22:50:49]

Is this right?  It seems like the IsOffTheRecord shouldn't be in the check
anymore.

[rpetterson, 2014/01/25 00:29:22]

Technically speaking GetServiceForBrowserContext should return NULL for OTR
profiles. I was mostly keeping it in there for logic sanity to make sure I'd
covered all my cases. I can remove it if you feel strongly.

[James Hawkins, 2014/01/27 18:14:37]

Yeah, I think it may be safer to let GetServiceForBrowserContext handle that
duty.  Hypothetically that behavior could change in the future, then this logic
wouldn't be doing the right thing.

[samarth, 2014/01/27 18:24:53]

Just so I understand correctly, this change is intended to make it so incognito
does not have a separate setting for hotwording and just follows the default? 
If so, I agree that this check is confusing.

If not, then I'm even more confused and perhaps some more detail in the CL
description would be useful.

[rpetterson, 2014/01/27 19:28:13]

I've pulled out this check.

And yes, this change is intended to make it so there is not a separate setting
for incognito (it's always off for incognito). I've updated the CL description
to better describe the changes.

[samarth, 2014/01/27 19:50:16]

Oh, that's different from what I thought.

I thought the default behavior was for services to share instances between the
main and incognito profiles?

       (profile->GetPrefs()->HasPrefPath(prefs::kHotwordSearchEnabled) &&
-       !profile->GetPrefs()->GetBoolean(prefs::kHotwordSearchEnabled)) ||
-      (profile->IsOffTheRecord() &&
-       !profile->GetPrefs()->GetBoolean(prefs::kHotwordSearchIncognitoEnabled)))
+       !profile->GetPrefs()->GetBoolean(prefs::kHotwordSearchEnabled)))
     return NULL;
 
   return static_cast<HotwordService*>(
       GetInstance()->GetServiceForBrowserContext(profile, true));
 }
 
 // static
 HotwordServiceFactory* HotwordServiceFactory::GetInstance() {
   return Singleton<HotwordServiceFactory>::get();
 }
@@ skipping 12 matching lines @@
 }
 
 HotwordServiceFactory::~HotwordServiceFactory() {
 }
 
 void HotwordServiceFactory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* prefs) {
   prefs->RegisterBooleanPref(prefs::kHotwordSearchEnabled,
                              false,
                              user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  prefs->RegisterBooleanPref(prefs::kHotwordSearchIncognitoEnabled,
-                             false,
-                             user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   prefs->RegisterIntegerPref(prefs::kHotwordOptInPopupTimesShown,
                              0,
                              user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  prefs->RegisterBooleanPref(prefs::kHotwordSearchTimeoutEnabled,
-                             true,
-                             user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-}
-
-content::BrowserContext* HotwordServiceFactory::GetBrowserContextToUse(
-    content::BrowserContext* context) const {
-  return chrome::GetBrowserContextOwnInstanceInIncognito(context);
 }
 
 BrowserContextKeyedService* HotwordServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* profile) const {
   return new HotwordService(static_cast<Profile*>(profile));
 }