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()) {
+    NOTREACHED();

[Peter Kasting, 2012/03/30 20:31:13]

Don't use NOTREACHED() like this -- it violates our style guide rule of "don't
handle DCHECK failure".

Instead, just DCHECK((access_type != Profile::IMPLICIT_ACCESS) ||
!profile->IsOffTheRecord()) and continue executing.  (3 places)

[GeorgeY, 2012/04/02 21:57:43]

I think it is one of the few places where it makes sense: if we return NULL here
it is guaranteed we won't write anything to disk, we might even crash. On the
other hand, if in some case we actually *try* to access it implicitly in
Incognito and succeed, we would violate privacy, which, I think, is worse

[Peter Kasting, 2012/04/02 22:09:06]

Sorry, I don't agree that this qualifies for an exemption.  Please change this.

[GeorgeY, 2012/04/02 22:49:02]

OK. Removed NOTREACHED in first two places - the third one continues the
execution after NOTREACHED 

+    return NULL;
+  }
+  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 NULL;
+  }
+  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())) {
+    NOTREACHED();
+  }
+  return wds.get();
+}