Refactor of ProfileInfoCache in c/b/notifications

chrome/browser/notifications/platform_notification_service_impl.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/notifications/platform_notification_service_impl.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 45 matching lines @@
 #include "extensions/common/constants.h"
 #include "extensions/common/permissions/api_permission.h"
 #include "extensions/common/permissions/permissions_data.h"
 #endif
 
 using content::BrowserContext;
 using content::BrowserThread;
 using content::PlatformNotificationContext;
 using message_center::NotifierId;
 
+class ProfileAttributesEntry;
+
 namespace {
 
 // Invalid id for a renderer process. Used in cases where we need to check for
 // permission without having an associated renderer process yet.
 const int kInvalidRenderProcessId = -1;
 
 // Persistent notifications fired through the delegate do not care about the
 // lifetime of the Service Worker responsible for executing the event.
 void OnClickEventDispatchComplete(
     content::PersistentNotificationStatus status) {
@@ skipping 80 matching lines @@
     int64_t persistent_notification_id,
     int action_index) {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   DCHECK(profile_manager);
 
   // ProfileManager does not offer a good interface to load a profile or
   // fail. Instead it offers a method to create the profile and simply load it
   // if it already exist. We therefore check first that the profile is there
   // and fail early otherwise.
   const base::FilePath profile_path =
-      profile_manager->GetProfileInfoCache().GetUserDataDir().AppendASCII(
-          profile_id);
+      profile_manager->user_data_dir().AppendASCII(profile_id);
 
-  if (profile_manager->GetProfileInfoCache().GetIndexOfProfileWithPath(
-          profile_path) == std::string::npos) {
+  ProfileAttributesEntry* entry = nullptr;
+  if (!profile_manager->GetProfileAttributesStorage().
+      GetProfileAttributesWithPath(profile_path, &entry)) {
     LOG(ERROR) << "Loading a path that does not exist";
     return;
   }
 
   profile_manager->CreateProfileAsync(
       profile_path,
       base::Bind(&ProfileLoadedCallback, operation, origin,
                  persistent_notification_id, action_index, incognito),
       base::string16(), std::string(), std::string());
 }
@@ skipping 359 matching lines @@
         extensions::ExtensionRegistry::Get(profile)->GetExtensionById(
             origin.host(), extensions::ExtensionRegistry::EVERYTHING);
     DCHECK(extension);
 
     return base::UTF8ToUTF16(extension->name());
   }
 #endif
 
   return base::string16();
 }