Do not announce robot account token before account ID is available

chrome/browser/chromeos/policy/device_cloud_policy_invalidator_unittest.cc

 // Copyright 2014 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/policy/device_cloud_policy_invalidator.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
@@ skipping 58 matching lines @@
                           DEVICE_MODE_ENTERPRISE),
       profile_manager_(TestingBrowserProcess::GetGlobal()) {
 }
 
 DeviceCloudPolicyInvalidatorTest::~DeviceCloudPolicyInvalidatorTest() {
 }
 
 void DeviceCloudPolicyInvalidatorTest::SetUp() {
   chromeos::SystemSaltGetter::Initialize();
   chromeos::DBusThreadManager::Initialize();
-  chromeos::DeviceOAuth2TokenServiceFactory::Initialize();
   TestingBrowserProcess::GetGlobal()->SetSystemRequestContext(
       system_request_context_.get());
   ASSERT_TRUE(profile_manager_.SetUp());
 
   test_device_settings_service_.reset(new
       chromeos::ScopedTestDeviceSettingsService);
   test_cros_settings_.reset(new chromeos::ScopedTestCrosSettings);
+  chromeos::DeviceOAuth2TokenServiceFactory::Initialize();
+
   scoped_refptr<ownership::MockOwnerKeyUtil> owner_key_util(
       new ownership::MockOwnerKeyUtil);
   owner_key_util->SetPublicKeyFromPrivateKey(
       *device_policy_.GetSigningKey());
   chromeos::DeviceSettingsService::Get()->SetSessionManager(
       &device_settings_test_helper_,
       owner_key_util);
 
   device_policy_.policy_data().set_invalidation_source(123);
   device_policy_.policy_data().set_invalidation_name("invalidation");
@@ skipping 82 matching lines @@
   ASSERT_TRUE(invalidator);
   EXPECT_EQ(1, invalidator->highest_handled_invalidation_version());
   EXPECT_EQ(&invalidation_service_1,
             invalidator->invalidation_service_for_test());
 
   provider.Shutdown();
   device_policy_invalidator.OnInvalidationServiceSet(nullptr);
 }
 
 }  // namespace policy