ChromeOS: This CL moves chromeos/login/user_names* to user_mananger.

chrome/browser/drive/drive_notification_manager_factory_browsertest.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/drive/drive_notification_manager_factory.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/chromeos_switches.h"
-#include "chromeos/login/user_names.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_manager.h"
+#include "components/user_manager/user_names.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace drive {
 
 class DriveNotificationManagerFactoryLoginScreenBrowserTest
     : public InProcessBrowserTest {
  protected:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitch(chromeos::switches::kLoginManager);
     command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
@@ skipping 12 matching lines @@
 
 class DriveNotificationManagerFactoryGuestBrowserTest
     : public InProcessBrowserTest {
  protected:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitch(chromeos::switches::kGuestSession);
     command_line->AppendSwitch(::switches::kIncognito);
     command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
     command_line->AppendSwitchASCII(
         chromeos::switches::kLoginUser,
-        chromeos::login::GuestAccountId().GetUserEmail());
+        user_manager::chromeos::GuestAccountId().GetUserEmail());
   }
 };
 
 // Verify that no DriveNotificationManager is instantiated for the sign-in
 // profile or the guest profile while a guest session is in progress.
 IN_PROC_BROWSER_TEST_F(DriveNotificationManagerFactoryGuestBrowserTest,
                        NoDriveNotificationManager) {
   user_manager::UserManager* user_manager = user_manager::UserManager::Get();
   EXPECT_TRUE(user_manager->IsLoggedInAsGuest());
   Profile* guest_profile =
       chromeos::ProfileHelper::Get()
           ->GetProfileByUserUnsafe(user_manager->GetActiveUser())
           ->GetOriginalProfile();
   Profile* signin_profile =
       chromeos::ProfileHelper::GetSigninProfile()->GetOriginalProfile();
   EXPECT_FALSE(DriveNotificationManagerFactory::FindForBrowserContext(
       guest_profile));
   EXPECT_FALSE(DriveNotificationManagerFactory::FindForBrowserContext(
       signin_profile));
 }
 
 }  // namespace drive