Restore KeyedServiceFactory diagnostics for context use-after-destroy.

chrome/browser/password_manager/password_manager_internals_service_unittest.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 "components/password_manager/core/browser/password_manager_internals_service.h"
 
 #include "chrome/test/base/testing_profile.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/password_manager/content/browser/password_manager_internals_service_factory.h"
 #include "components/password_manager/core/browser/log_receiver.h"
@@ skipping 12 matching lines @@
  public:
   MockLogReceiver() {}
 
   MOCK_METHOD1(LogSavePasswordProgress, void(const std::string&));
 };
 
 enum ProfileType { NORMAL_PROFILE, INCOGNITO_PROFILE };
 
 std::unique_ptr<TestingProfile> CreateProfile(ProfileType type) {
   TestingProfile::Builder builder;
-  std::unique_ptr<TestingProfile> profile(builder.Build());
-#if !defined(NDEBUG)
-  // During the test cases, the profiles may get created on the same address. To
-  // avoid over-zealous asserts we need to mark the newly created one as "live".
-  // See declaration of MarkBrowserContextLiveForTesting for more details.
-  BrowserContextDependencyManager::GetInstance()
-      ->MarkBrowserContextLiveForTesting(profile.get());
-  if (type == INCOGNITO_PROFILE) {
-    BrowserContextDependencyManager::GetInstance()
-        ->MarkBrowserContextLiveForTesting(profile->GetOffTheRecordProfile());
-  }
-#endif
-  return profile;
+  return builder.Build();
 }
 
 }  // namespace
 
 class PasswordManagerInternalsServiceTest : public testing::Test {
   content::TestBrowserThreadBundle thread_bundle_;
 };
 
 // When the profile is not incognito, it should be possible to activate the
 // service.
@@ skipping 23 matching lines @@
 
   Profile* incognito_profile = profile->GetOffTheRecordProfile();
   PasswordManagerInternalsService* service =
       PasswordManagerInternalsServiceFactory::GetForBrowserContext(
           incognito_profile);
   // BrowserContextKeyedBaseFactory::GetBrowserContextToUse should return NULL
   // for |profile|, because |profile| is incognito. Therefore the returned
   // |service| should also be NULL.
   EXPECT_FALSE(service);
 }