Refactor of ProfileInfoCache in c/b/notifications

chrome/browser/notifications/message_center_settings_controller_unittest.cc

 // Copyright 2013 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 <string>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 33 matching lines @@
   }
 
   void SetUp() override { ASSERT_TRUE(testing_profile_manager_.SetUp()); }
 
   virtual TestingProfile* CreateProfile(const std::string& name) {
     return testing_profile_manager_.CreateTestingProfile(name);
   }
 
   void CreateController() {
     controller_.reset(new MessageCenterSettingsController(
-        testing_profile_manager_.profile_info_cache()));
+        *testing_profile_manager_.profile_attributes_storage()));
   }
 
   void ResetController() {
     controller_.reset();
   }
 
   MessageCenterSettingsController* controller() { return controller_.get(); }
 
  private:
   content::TestBrowserThreadBundle thread_bundle_;
@@ skipping 59 matching lines @@
 #if !defined(OS_CHROMEOS)
 TEST_F(MessageCenterSettingsControllerTest, NotifierGroups) {
   CreateProfile("Profile-1");
   CreateProfile("Profile-2");
   CreateController();
 
   EXPECT_EQ(controller()->GetNotifierGroupCount(), 2u);
 
   EXPECT_EQ(controller()->GetNotifierGroupAt(0).name,
             base::UTF8ToUTF16("Profile-1"));
-  EXPECT_EQ(controller()->GetNotifierGroupAt(0).index, 0u);
-
   EXPECT_EQ(controller()->GetNotifierGroupAt(1).name,
             base::UTF8ToUTF16("Profile-2"));
-  EXPECT_EQ(controller()->GetNotifierGroupAt(1).index, 1u);
 
   EXPECT_EQ(controller()->GetActiveNotifierGroup().name,
             base::UTF8ToUTF16("Profile-1"));
-  EXPECT_EQ(controller()->GetActiveNotifierGroup().index, 0u);
 
   controller()->SwitchToNotifierGroup(1);
   EXPECT_EQ(controller()->GetActiveNotifierGroup().name,
             base::UTF8ToUTF16("Profile-2"));
-  EXPECT_EQ(controller()->GetActiveNotifierGroup().index, 1u);
 
   controller()->SwitchToNotifierGroup(0);
   EXPECT_EQ(controller()->GetActiveNotifierGroup().name,
             base::UTF8ToUTF16("Profile-1"));
 }
 #else   // !defined(OS_CHROMEOS)
 TEST_F(MessageCenterSettingsControllerChromeOSTest, NotifierGroups) {
   CreateProfile("Profile-1");
   CreateProfile("Profile-2");
   CreateController();
 
   EXPECT_EQ(controller()->GetNotifierGroupCount(), 1u);
 
   EXPECT_EQ(controller()->GetNotifierGroupAt(0).name,
             base::UTF8ToUTF16("Profile-1"));
-  EXPECT_EQ(controller()->GetNotifierGroupAt(0).index, 0u);
 
   SwitchActiveUser("Profile-2");
   EXPECT_EQ(controller()->GetNotifierGroupCount(), 1u);
   EXPECT_EQ(controller()->GetNotifierGroupAt(0).name,
             base::UTF8ToUTF16("Profile-2"));
-  EXPECT_EQ(controller()->GetNotifierGroupAt(0).index, 1u);
 
   SwitchActiveUser("Profile-1");
   EXPECT_EQ(controller()->GetNotifierGroupCount(), 1u);
   EXPECT_EQ(controller()->GetNotifierGroupAt(0).name,
             base::UTF8ToUTF16("Profile-1"));
-  EXPECT_EQ(controller()->GetNotifierGroupAt(0).index, 0u);
 }
 // TODO(mukai): write a test case to reproduce the actual guest session scenario
 // in ChromeOS -- no profiles in the profile_info_cache.
 #endif  // !defined(OS_CHROMEOS)
 
 TEST_F(MessageCenterSettingsControllerTest, NotifierSortOrder) {
   TestingProfile* profile = CreateProfile("Profile-1");
   extensions::TestExtensionSystem* test_extension_system =
       static_cast<extensions::TestExtensionSystem*>(
           extensions::ExtensionSystem::Get(profile));
@@ skipping 155 matching lines @@
   // (5) Enable the permission when the default is blocked (expected to set).
   controller()->SetNotifierEnabled(disabled_notifier, true);
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             DesktopNotificationProfileUtil::GetContentSetting(profile, origin));
 
   // (6) Disable the permission when the default is blocked (expected to clear).
   controller()->SetNotifierEnabled(enabled_notifier, false);
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             DesktopNotificationProfileUtil::GetContentSetting(profile, origin));
 }