Revert of This CL replaces user_manager::UserID with AccountId.

chrome/browser/renderer_context_menu/render_view_context_menu_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 <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 31 matching lines @@
 #include "content/public/test/test_utils.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_filter.h"
 #include "net/url_request/url_request_interceptor.h"
 #include "third_party/WebKit/public/web/WebContextMenuData.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
-#include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_manager.h"
 #endif
 
 using content::WebContents;
 
 namespace {
 
 class ContextMenuBrowserTest : public InProcessBrowserTest {
  public:
   ContextMenuBrowserTest() {}
@@ skipping 40 matching lines @@
     menu->Init();
     return menu;
   }
 
   Profile* CreateSecondaryProfile(int profile_num) {
     ProfileManager* profile_manager = g_browser_process->profile_manager();
     base::FilePath profile_path = profile_manager->user_data_dir();
 #if defined(OS_CHROMEOS)
     std::string profile_name = base::StringPrintf("NewProfile%d", profile_num);
     user_manager::UserManager::Get()->UserLoggedIn(
-        AccountId::FromUserEmail(
-            base::StringPrintf("user%d@test.com", profile_num)),
-        profile_name, false);
+        base::StringPrintf("user%d@test.com", profile_num), profile_name,
+        false);
     profile_path = profile_path.Append(
         chromeos::ProfileHelper::GetUserProfileDir(profile_name).BaseName());
 #else
     profile_path = profile_path.AppendASCII(
         base::StringPrintf("New Profile %d", profile_num));
 #endif
     return profile_manager->GetProfile(profile_path);
   }
 };
 
@@ skipping 679 matching lines @@
 IN_PROC_BROWSER_TEST_F(LoadImageBrowserTest, LoadImage) {
   static const char kValidImage[] = "files/load_image/image.png";
   SetupAndLoadImagePage(kValidImage);
   AddLoadImageInterceptor(kValidImage);
   AttemptLoadImage();
   interceptor_->WaitForRequests(1);
   EXPECT_EQ(1, interceptor_->num_requests());
 }
 
 }  // namespace