RLZ on ChromeOS-related polishing.

chrome/browser/chromeos/login/login_utils_browsertest.cc

Index: chrome/browser/chromeos/login/login_utils_browsertest.cc
diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc
index 198c78e4f7f646a100240eee167701d22bc7d9c4..80092e9936b0e5dc1c3877b4573c67f0a664e58b 100644
--- a/chrome/browser/chromeos/login/login_utils_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc
@@ -274,6 +274,7 @@ class LoginUtilsTest : public testing::Test,
     browser_process_->SetIOThread(io_thread_state_.get());
 
 #if defined(ENABLE_RLZ)
+    rlz_initialized_cb_ = base::Bind(&base::DoNothing);
     rlz_lib::testing::SetRlzStoreDirectory(scoped_temp_dir_.path());
     RLZTracker::EnableZeroDelayForTesting();
 #endif
@@ -562,15 +563,15 @@ TEST_F(LoginUtilsTest, RlzInitialized) {
 
   PrepareProfile(kUsername);
 
-  wait_for_rlz_init.Run();
-  // Wait for blocking RLZ tasks to complete.
-  RunUntilIdle();
-
   // This should shortcut cookie transfer step that is missing due to
   // IO thread being mocked.
   EXPECT_TRUE(created_profile_);
   LoginUtils::Get()->CompleteProfileCreate(created_profile_);
 
+  wait_for_rlz_init.Run();
+  // Wait for blocking RLZ tasks to complete.
+  RunUntilIdle();
+
   // RLZ brand code has been set to empty string.
   EXPECT_TRUE(local_state_.Get()->HasPrefPath(prefs::kRLZBrand));
   EXPECT_EQ(std::string(), local_state_.Get()->GetString(prefs::kRLZBrand));