Reland crrev.com/111358

chrome/browser/profiles/profile_manager.h

 // Copyright (c) 2011 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.
 
 // This class keeps track of the currently-active profiles in the runtime.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_
 #pragma once
 
 #include <list>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
+#include "base/gtest_prod_util.h"
 #include "base/hash_tables.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/threading/non_thread_safe.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_init.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
@@ skipping 179 matching lines @@
   // Does final initial actions.
   virtual void DoFinalInit(Profile* profile, bool go_off_the_record);
   virtual void DoFinalInitForServices(Profile* profile, bool go_off_the_record);
   virtual void DoFinalInitLogging(Profile* profile);
 
   // Creates a new profile. Virtual so that unittests can return TestingProfile.
   virtual Profile* CreateProfile(const FilePath& path);
 
  private:
   friend class TestingProfileManager;
-  FRIEND_TEST(ProfileManagerBrowserTest, DeleteAllProfiles);
+  FRIEND_TEST_ALL_PREFIXES(ProfileManagerBrowserTest, DeleteAllProfiles);
 
   // This struct contains information about profiles which are being loaded or
   // were loaded.
   struct ProfileInfo {
     ProfileInfo(Profile* profile, bool created)
         : profile(profile), created(created) {
     }
 
     ~ProfileInfo() {}
 
@@ skipping 77 matching lines @@
 class ProfileManagerWithoutInit : public ProfileManager {
  public:
   explicit ProfileManagerWithoutInit(const FilePath& user_data_dir);
 
  protected:
   virtual void DoFinalInitForServices(Profile*, bool) OVERRIDE {}
   virtual void DoFinalInitLogging(Profile*) OVERRIDE {}
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_