Moved WebDataService to ProfileKeyedService

chrome/browser/webdata/web_data_service_factory.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/webdata/web_data_service_factory.h"
+
+#include "base/file_path.h"
+#include "chrome/browser/profiles/profile_dependency_manager.h"
+#include "chrome/browser/webdata/web_data_service.h"
+#include "chrome/common/chrome_constants.h"
+
+WebDataServiceFactory::WebDataServiceFactory()
+    : RefcountedProfileKeyedServiceFactory(
+          "WebDataService",
+          ProfileDependencyManager::GetInstance()) {
+  // WebDataServiceFactory has no dependecies.
+}
+
+WebDataServiceFactory::~WebDataServiceFactory() {}
+
+// static
+scoped_refptr<WebDataService> WebDataServiceFactory::GetForProfile(
+    Profile* profile, Profile::ServiceAccessType access_type) {
+  if (access_type == Profile::IMPLICIT_ACCESS && profile->IsOffTheRecord()) {

[Peter Kasting, 2012/04/02 23:21:13]

Nit: Use DCHECK() as requested previously:


  DCHECK((access_type == Profile::EXPLICIT_ACCESS) ||
         !profile->IsOffTheRecord());

(2 places)

[GeorgeY, 2012/04/03 20:13:29]

Done.

+    NOTREACHED();
+  }
+  return static_cast<WebDataService*>(
+      GetInstance()->GetServiceForProfile(profile, true).get());
+}
+
+// static
+scoped_refptr<WebDataService> WebDataServiceFactory::GetForProfileIfExists(
+    Profile* profile, Profile::ServiceAccessType access_type) {
+  if (access_type == Profile::IMPLICIT_ACCESS && profile->IsOffTheRecord()) {
+    NOTREACHED();
+  }
+  return static_cast<WebDataService*>(
+      GetInstance()->GetServiceForProfile(profile, false).get());
+}
+
+// static
+WebDataServiceFactory* WebDataServiceFactory::GetInstance() {
+  return Singleton<WebDataServiceFactory>::get();
+}
+
+bool WebDataServiceFactory::ServiceRedirectedInIncognito() {
+  return false;
+}
+
+scoped_refptr<RefcountedProfileKeyedService>
+WebDataServiceFactory::BuildServiceInstanceFor(Profile* profile) const {
+  DCHECK(profile);
+
+  FilePath path = profile->GetPath();
+  path = path.Append(chrome::kWebDataFilename);
+
+  scoped_refptr<WebDataService> wds(new WebDataService());
+  if (!wds->Init(profile->GetPath())) {

[Peter Kasting, 2012/04/02 23:21:13]

Nit: {} unnecessary

[GeorgeY, 2012/04/03 20:13:29]

Done.

+    NOTREACHED();
+  }
+  return wds.get();
+}