Replace ProfileManagerObserver with callback

chrome/browser/profiles/profile_manager_unittest.cc

 // 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.
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
+#include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/system_monitor/system_monitor.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_event_router_forwarder.h"
 #include "chrome/browser/io_thread.h"
@@ skipping 89 matching lines @@
   CommandLine *cl = CommandLine::ForCurrentProcess();
   cl->AppendSwitch(switches::kTestType);
 #endif
   }
 
   virtual void TearDown() {
     profile_manager_.reset();
     message_loop_.RunAllPending();
   }
 
-  class MockObserver : public ProfileManagerObserver {
+  class MockObserver : public base::RefCountedThreadSafe<MockObserver> {

[Robert Sesek, 2011/12/07 16:36:13]

Why does this need to be refcounted?

[sail, 2011/12/07 17:18:13]

So I can use it in base::Bind().

[Robert Sesek, 2011/12/07 18:07:40]

Can't you just use Unretained() because the MockObserver is limited to the scope
of each test?

[sail, 2011/12/07 18:34:04]

Done.

    public:
-    MOCK_METHOD2(OnProfileCreated, void(Profile* profile, Status status));
+    MOCK_METHOD2(OnProfileCreated, void(Profile* profile,

[Robert Sesek, 2011/12/07 16:36:13]

I'd break after the first ,

[sail, 2011/12/07 17:18:13]

Done.

+        Profile::CreateStatus status));
   };
 
 #if defined(OS_CHROMEOS)
   // Do not change order of stub_cros_enabler_, which needs to be constructed
   // before io_thread_ which requires CrosLibrary to be initialized to construct
   // its data member pref_proxy_config_tracker_ on ChromeOS.
   chromeos::ScopedStubCrosEnabler stub_cros_enabler_;
 #endif
 
   // The path to temporary directory used to contain the test operations.
@@ skipping 90 matching lines @@
   // Make sure any pending tasks run before we destroy the profiles.
   message_loop_.RunAllPending();
 
   profile_manager_.reset();
 
   // Make sure history cleans up correctly.
   message_loop_.RunAllPending();
 }
 
 MATCHER(NotFail, "Profile creation failure status is not reported.") {
-  return arg == ProfileManagerObserver::STATUS_CREATED ||
-      arg == ProfileManagerObserver::STATUS_INITIALIZED;
+  return arg == Profile::CREATE_STATUS_CREATED ||
+         arg == Profile::CREATE_STATUS_INITIALIZED;
 }
 
 // Tests asynchronous profile creation mechanism.
 TEST_F(ProfileManagerTest, DISABLED_CreateProfileAsync) {
   FilePath dest_path =
       temp_dir_.path().Append(FILE_PATH_LITERAL("New Profile"));
 
-  MockObserver mock_observer;
-  EXPECT_CALL(mock_observer, OnProfileCreated(
+  scoped_refptr<MockObserver> mock_observer = new MockObserver;
+  EXPECT_CALL(*mock_observer, OnProfileCreated(
       testing::NotNull(), NotFail())).Times(testing::AtLeast(1));
 
-  profile_manager_->CreateProfileAsync(dest_path, &mock_observer);
+  profile_manager_->CreateProfileAsync(dest_path,
+      base::Bind(&MockObserver::OnProfileCreated, mock_observer.get()));
 
   message_loop_.RunAllPending();
 }
 
 MATCHER(SameNotNull, "The same non-NULL value for all calls.") {
   if (!g_created_profile)
     g_created_profile = arg;
   return arg != NULL && arg == g_created_profile;
 }
 
 TEST_F(ProfileManagerTest, CreateProfileAsyncMultipleRequests) {
   FilePath dest_path =
       temp_dir_.path().Append(FILE_PATH_LITERAL("New Profile"));
 
   g_created_profile = NULL;
 
-  MockObserver mock_observer1;
-  EXPECT_CALL(mock_observer1, OnProfileCreated(
+  scoped_refptr<MockObserver> mock_observer1 = new MockObserver;
+  EXPECT_CALL(*mock_observer1, OnProfileCreated(
       SameNotNull(), NotFail())).Times(testing::AtLeast(1));
-  MockObserver mock_observer2;
-  EXPECT_CALL(mock_observer2, OnProfileCreated(
+  scoped_refptr<MockObserver> mock_observer2 = new MockObserver;
+  EXPECT_CALL(*mock_observer2, OnProfileCreated(
       SameNotNull(), NotFail())).Times(testing::AtLeast(1));
-  MockObserver mock_observer3;
-  EXPECT_CALL(mock_observer3, OnProfileCreated(
+  scoped_refptr<MockObserver> mock_observer3 = new MockObserver;
+  EXPECT_CALL(*mock_observer3, OnProfileCreated(
       SameNotNull(), NotFail())).Times(testing::AtLeast(1));
 
-  profile_manager_->CreateProfileAsync(dest_path, &mock_observer1);
-  profile_manager_->CreateProfileAsync(dest_path, &mock_observer2);
-  profile_manager_->CreateProfileAsync(dest_path, &mock_observer3);
+  profile_manager_->CreateProfileAsync(dest_path,
+      base::Bind(&MockObserver::OnProfileCreated, mock_observer1.get()));
+  profile_manager_->CreateProfileAsync(dest_path,
+      base::Bind(&MockObserver::OnProfileCreated, mock_observer2.get()));
+  profile_manager_->CreateProfileAsync(dest_path,
+      base::Bind(&MockObserver::OnProfileCreated, mock_observer3.get()));
 
   message_loop_.RunAllPending();
 }
 
 TEST_F(ProfileManagerTest, CreateProfilesAsync) {
   FilePath dest_path1 =
       temp_dir_.path().Append(FILE_PATH_LITERAL("New Profile 1"));
   FilePath dest_path2 =
       temp_dir_.path().Append(FILE_PATH_LITERAL("New Profile 2"));
 
-  MockObserver mock_observer;
-  EXPECT_CALL(mock_observer, OnProfileCreated(
+  scoped_refptr<MockObserver> mock_observer = new MockObserver;
+  EXPECT_CALL(*mock_observer, OnProfileCreated(
       testing::NotNull(), NotFail())).Times(testing::AtLeast(3));
 
-  profile_manager_->CreateProfileAsync(dest_path1, &mock_observer);
-  profile_manager_->CreateProfileAsync(dest_path2, &mock_observer);
+  profile_manager_->CreateProfileAsync(dest_path1,
+      base::Bind(&MockObserver::OnProfileCreated, mock_observer.get()));
+  profile_manager_->CreateProfileAsync(dest_path2,
+      base::Bind(&MockObserver::OnProfileCreated, mock_observer.get()));
 
   message_loop_.RunAllPending();
 }
 
 TEST_F(ProfileManagerTest, AutoloadProfilesWithBackgroundApps) {
   ProfileInfoCache& cache = profile_manager_->GetProfileInfoCache();
 
   EXPECT_EQ(0u, cache.GetNumberOfProfiles());
   cache.AddProfileToCache(cache.GetUserDataDir().AppendASCII("path_1"),
                           ASCIIToUTF16("name_1"), string16(), 0);
   cache.AddProfileToCache(cache.GetUserDataDir().AppendASCII("path_2"),
                           ASCIIToUTF16("name_2"), string16(), 0);
   cache.AddProfileToCache(cache.GetUserDataDir().AppendASCII("path_3"),
                           ASCIIToUTF16("name_3"), string16(), 0);
   cache.SetBackgroundStatusOfProfileAtIndex(0, true);
   cache.SetBackgroundStatusOfProfileAtIndex(2, true);
   EXPECT_EQ(3u, cache.GetNumberOfProfiles());
 
   profile_manager_->AutoloadProfiles();
 
   EXPECT_EQ(2u, profile_manager_->GetLoadedProfiles().size());
 }