Change RulesRegistryService to use ProfileKeyedAPI.

chrome/browser/extensions/api/declarative/rules_registry_service.cc

 // Copyright (c) 2012 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/extensions/api/declarative/rules_registry_service.h"
 
 #include "base/bind.h"
+#include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/api/declarative/initializing_rules_registry.h"
 #include "chrome/browser/extensions/api/declarative_content/content_rules_registry.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.h"
 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
@@ skipping 11 matching lines @@
       profile, web_request_rules_registry);
 }
 
 }  // namespace
 
 RulesRegistryService::RulesRegistryService(Profile* profile)
     : profile_(profile) {
   if (profile) {
     registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                    content::Source<Profile>(profile->GetOriginalProfile()));
+    if (profile->HasOffTheRecordProfile() &&
+        profile->GetOffTheRecordProfile() == profile) {
+
+        // Only initialize the RulesRegistryService for a OTR profile
+        // if the regular ExtensionSystem has been initialized properly, as we
+        // depend on it. Some ChromeOS browser tests don't initialize the
+        // regular ExtensionSystem in login-tests. Currently these browser
+        // tests are EnterpriseLoginBlocksForEnterpriseUser and

[Yoyo Zhou, 2013/05/09 01:08:54]

You don't have to name these tests here; this comment will get out of date.

+        // NormalLoginDoesntBlock.
+      if (ExtensionSystem::Get(profile)->extension_service())
+        RegisterDefaultRulesRegistries();
+    } else {
+      RegisterDefaultRulesRegistries();
+    }
   }
 }
 
 RulesRegistryService::~RulesRegistryService() {}
 
 void RulesRegistryService::RegisterDefaultRulesRegistries() {
   scoped_ptr<RulesRegistryWithCache::RuleStorageOnUI> ui_part;
   scoped_refptr<WebRequestRulesRegistry> web_request_rules_registry(
       new WebRequestRulesRegistry(profile_, &ui_part));
   ui_parts_of_registries_.push_back(ui_part.release());
@@ skipping 14 matching lines @@
 #endif  // defined(ENABLE_EXTENSIONS)
 }
 
 void RulesRegistryService::Shutdown() {
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&RegisterToExtensionWebRequestEventRouterOnIO,
           profile_, scoped_refptr<WebRequestRulesRegistry>(NULL)));
 }
 
+static base::LazyInstance<ProfileKeyedAPIFactory<RulesRegistryService> >
+g_factory = LAZY_INSTANCE_INITIALIZER;
+
+// static
+ProfileKeyedAPIFactory<RulesRegistryService>*
+RulesRegistryService::GetFactoryInstance() {
+  return &g_factory.Get();
+}
+
+// static
+RulesRegistryService* RulesRegistryService::Get(Profile* profile) {
+  return ProfileKeyedAPIFactory<RulesRegistryService>::GetForProfile(profile);
+}
+
 void RulesRegistryService::RegisterRulesRegistry(
     scoped_refptr<RulesRegistry> rule_registry) {
   const std::string event_name(rule_registry->event_name());
   DCHECK(rule_registries_.find(event_name) == rule_registries_.end());
   rule_registries_[event_name] =
       make_scoped_refptr(new InitializingRulesRegistry(rule_registry));
 }
 
 scoped_refptr<RulesRegistry> RulesRegistryService::GetRulesRegistry(
     const std::string& event_name) const {
@@ skipping 36 matching lines @@
       OnExtensionUnloaded(extension->id());
       break;
     }
     default:
       NOTREACHED();
       break;
   }
 }
 
 }  // namespace extensions