Make Easy Unlock app have separate instance in incognito

chrome/browser/signin/easy_unlock_service_factory.cc

 // Copyright 2014 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/signin/easy_unlock_service_factory.h"
 
 #include "base/memory/singleton.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/easy_unlock_service.h"
@@ skipping 32 matching lines @@
 }
 
 EasyUnlockServiceFactory::~EasyUnlockServiceFactory() {
 }
 
 KeyedService* EasyUnlockServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
 #if defined(OS_CHROMEOS)
   if (chromeos::ProfileHelper::IsSigninProfile(
           Profile::FromBrowserContext(context))) {
-    if (EasyUnlockService::IsSignInEnabled()) {
+    if (EasyUnlockService::IsSignInEnabled() && context->IsOffTheRecord()) {
       return new EasyUnlockServiceSignin(Profile::FromBrowserContext(context));
     } else {
       return NULL;
     }
   }
 #endif
   return new EasyUnlockServiceRegular(Profile::FromBrowserContext(context));
 }
 
 content::BrowserContext* EasyUnlockServiceFactory::GetBrowserContextToUse(
       content::BrowserContext* context) const {
+#if defined(OS_CHROMEOS)
+  if (chromeos::ProfileHelper::IsSigninProfile(
+          Profile::FromBrowserContext(context))) {
+    return chrome::GetBrowserContextOwnInstanceInIncognito(context);
+  }
+#endif
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 bool EasyUnlockServiceFactory::ServiceIsCreatedWithBrowserContext() const {
   return true;
 }
 
 bool EasyUnlockServiceFactory::ServiceIsNULLWhileTesting() const {
   // Don't create the service for TestingProfile used in unit_tests because
   // EasyUnlockService uses ExtensionSystem::ready().Post, which expects
   // a MessageLoop that does not exit in many unit_tests cases.
   return true;
 }