Revert 269892 "linux_aura: Compile ash into chrome."

trunk/src/chrome/browser/ui/ash/session_state_delegate_views.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/ui/ash/session_state_delegate_views.h"
 
 #include "ash/session/user_info.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 90 matching lines @@
   return false;
 }
 
 ash::SessionStateDelegate::SessionState SessionStateDelegate::GetSessionState()
     const {
   return SESSION_STATE_ACTIVE;
 }
 
 const ash::UserInfo* SessionStateDelegate::GetUserInfo(
     ash::MultiProfileIndex index) const {
-  return GetUserInfo(static_cast<content::BrowserContext*>(NULL));
+  return GetUserInfo(NULL);
 }
 
 const ash::UserInfo* SessionStateDelegate::GetUserInfo(
     content::BrowserContext* context) const {
   static const ash::UserInfo* kUserInfo = new EmptyUserInfo();
   return kUserInfo;
 }
 
 bool SessionStateDelegate::ShouldShowAvatar(aura::Window* window) const {
   return false;
 }
 
 void SessionStateDelegate::SwitchActiveUser(const std::string& user_id) {
   NOTIMPLEMENTED();
 }
 
 void SessionStateDelegate::CycleActiveUser(CycleUser cycle_user) {
   NOTIMPLEMENTED();
 }
 
 void SessionStateDelegate::AddSessionStateObserver(
     ash::SessionStateObserver* observer) {
   NOTIMPLEMENTED();
 }
 
 void SessionStateDelegate::RemoveSessionStateObserver(
     ash::SessionStateObserver* observer) {
   NOTIMPLEMENTED();
 }