Revert "Refactor ProfileInfoCache in most of c/b/profiles"

chrome/browser/ui/webui/signin/signin_create_profile_handler_unittest.cc

 // Copyright 2016 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/ui/webui/signin/signin_create_profile_handler.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/profiles/profile_attributes_entry.h"
-#include "chrome/browser/profiles/profile_attributes_storage.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/signin/fake_signin_manager_builder.h"
 #include "chrome/browser/signin/signin_error_controller_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h"
 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service_factory.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/testing_browser_process.h"
@@ skipping 184 matching lines @@
 
     // The second supervised user exists on the device.
     profile_manager()->CreateTestingProfile(
         kSupervisedUsername2,
         std::unique_ptr<syncable_prefs::PrefServiceSyncable>(),
         base::UTF8ToUTF16(kSupervisedUsername2),
         0,
         kSupervisedUserId2,  // supervised_user_id
         TestingProfile::TestingFactories());
 
-    EXPECT_EQ(2u,
-        profile_manager()->profile_attributes_storage()->GetNumberOfProfiles());
+    const ProfileInfoCache* cache = profile_manager_->profile_info_cache();
+    EXPECT_EQ(2u, cache->GetNumberOfProfiles());
   }
 
   void TearDown() override {
     profile_manager_.reset();
     handler_.reset();
     BrowserWithTestWindowTest::TearDown();
   }
 
   content::TestWebUI* web_ui() {
     return web_ui_.get();
@@ skipping 345 matching lines @@
   list_args.Append(new base::StringValue(profiles::GetDefaultAvatarIconUrl(0)));
   list_args.Append(new base::FundamentalValue(false));  // create_shortcut
   list_args.Append(new base::FundamentalValue(true));  // is_supervised
   list_args.Append(new base::StringValue(""));  // supervised_user_id
   list_args.Append(new base::StringValue(custodian()->GetPath().value()));
   handler()->CreateProfile(&list_args);
 
   // Expect nothing to happen.
   EXPECT_EQ(0U, web_ui()->call_data().size());
 }