Revert of GetAccountIdFromProfile() should not return an empty account id if a valid profile is provided.

chrome/browser/ui/ash/chrome_screenshot_grabber_unittest.cc

 // Copyright 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/ui/ash/chrome_screenshot_grabber.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "content/public/test/test_utils.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/snapshot/screenshot_grabber.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/login/users/mock_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chromeos/login/login_state.h"
 #endif
 
 namespace ash {
 namespace test {
 
 class ChromeScreenshotGrabberTest : public AshTestBase,
                                     public ui::ScreenshotGrabberObserver {
  public:
   ChromeScreenshotGrabberTest()
@@ skipping 64 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(ChromeScreenshotGrabberTest);
 };
 
 TEST_F(ChromeScreenshotGrabberTest, TakeScreenshot) {
 #if defined(OS_CHROMEOS)
   // Note that within the test framework the LoginState object will always
   // claim that the user did log in.
   ASSERT_FALSE(chromeos::LoginState::IsInitialized());
   chromeos::LoginState::Initialize();
-  chromeos::ScopedUserManagerEnabler scoped_enabler(
-      new chromeos::MockUserManager());
 #endif
   base::ScopedTempDir directory;
   ASSERT_TRUE(directory.CreateUniqueTempDir());
   EXPECT_TRUE(chrome_screenshot_grabber()->CanTakeScreenshot());
 
   screenshot_grabber()->TakeScreenshot(
       Shell::GetPrimaryRootWindow(), gfx::Rect(0, 0, 100, 100),
       directory.path().AppendASCII("Screenshot.png"));
 
   EXPECT_FALSE(screenshot_grabber()->CanTakeScreenshot());
@@ skipping 13 matching lines @@
   if (ScreenshotGrabberObserver::SCREENSHOT_SUCCESS == screenshot_result_)
     EXPECT_TRUE(base::PathExists(screenshot_path_));
 
 #if defined(OS_CHROMEOS)
   chromeos::LoginState::Shutdown();
 #endif
 }
 
 }  // namespace test
 }  // namespace ash