Fix Arc integration test.

chrome/browser/chromeos/profiles/profile_helper.cc

 // Copyright (c) 2013 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/profiles/profile_helper.h"
 
 #include "base/barrier_closure.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
@@ skipping 324 matching lines @@
       return user_manager::UserManager::Get()->GetPrimaryUser();
 
     const std::string& user_name = profile->GetProfileUserName();
     for (user_manager::UserList::const_iterator it =
              user_list_for_testing_.begin();
          it != user_list_for_testing_.end();
          ++it) {
       if ((*it)->GetAccountId().GetUserEmail() == user_name)
         return *it;
     }
-
     // In case of test setup we should always default to primary user.
     return user_manager::UserManager::Get()->GetPrimaryUser();
   }
 
   DCHECK(!content::BrowserThread::IsThreadInitialized(
              content::BrowserThread::UI) ||
          content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   if (ProfileHelper::IsSigninProfile(profile))
     return NULL;
 
@@ skipping 104 matching lines @@
 void ProfileHelper::RemoveUserFromListForTesting(const AccountId& account_id) {
   auto it =
       std::find_if(user_list_for_testing_.begin(), user_list_for_testing_.end(),
                    [&account_id](const user_manager::User* user) {
                      return user->GetAccountId() == account_id;
                    });
   if (it != user_list_for_testing_.end())
     user_list_for_testing_.erase(it);
 }
 
+void ProfileHelper::ClearUserToProfileMappingForTesting() {

[lgcheng, 2017/02/22 23:36:44]

In Arc sync integration tests, users(not browser_test base user, sync test user
added in setupService) are destroyed without notify this field thus lead to
shutdown crash.  

+  user_list_for_testing_.clear();
+}
+
 // static
 std::string ProfileHelper::GetUserIdHashByUserIdForTesting(
     const std::string& user_id) {
   return user_id + kUserIdHashSuffix;
 }
 
 void ProfileHelper::FlushProfile(Profile* profile) {
   if (!profile_flusher_)
     profile_flusher_.reset(new FileFlusher);
 
@@ skipping 11 matching lines @@
       DownloadPrefs::FromBrowserContext(profile)->DownloadPath());
   // Let extension system handle extension files.
   excludes.push_back(base::FilePath(extensions::kInstallDirectoryName));
   // Do not flush Drive cache.
   excludes.push_back(base::FilePath(chromeos::kDriveCacheDirname));
 
   profile_flusher_->RequestFlush(profile->GetPath(), excludes, base::Closure());
 }
 
 }  // namespace chromeos