RLZ on ChromeOS-related polishing.

chrome/browser/chromeos/login/login_utils_browsertest.cc

 // Copyright (c) 2012 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/chromeos/login/login_utils.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 252 matching lines @@
         new ProfileManagerWithoutInit(scoped_temp_dir_.path()));
     connector_ = browser_process_->browser_policy_connector();
     connector_->Init();
 
     io_thread_state_.reset(new IOThread(local_state_.Get(),
                                         g_browser_process->policy_service(),
                                         NULL, NULL));
     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();

[Peter Kasting, 2012/12/21 18:24:11]

Is this call still needed?  If not, EnableZeroDelayForTesting() can go away
entirely and rlz.cc can just do it inline internally where necessary.

[Ivan Korotkov, 2012/12/22 12:43:04]

Yes, unfortunately :( login_utils_browsertest is not really an
InProcessBrowserTest and lots of things break if kTestType is added to
command-line in it.

 #endif
 
     RunUntilIdle();
   }
 
   virtual void TearDown() OVERRIDE {
     cryptohome::AsyncMethodCaller::Shutdown();
     mock_async_method_caller_ = NULL;
 
     UserManager::Get()->Shutdown();
@@ skipping 365 matching lines @@
 }
 
 INSTANTIATE_TEST_CASE_P(
     LoginUtilsBlockingLoginTestInstance,
     LoginUtilsBlockingLoginTest,
     testing::Values(0, 1, 2, 3, 4, 5));
 
 }  // namespace
 
 }