Move avatar holder code to ash

chrome/browser/ui/browser_navigator_browsertest_chromeos.cc

Index: chrome/browser/ui/browser_navigator_browsertest_chromeos.cc
diff --git a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc b/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc
index 9d3d3abdf5c1bc0796e1e1798467bb15e9363150..a5795d48ce7490abd9476f5a419dba4aeff15d65 100644
--- a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc
+++ b/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc
@@ -47,9 +47,10 @@ class TestMultiUserWindowManager : public chrome::MultiUserWindowManager {
       std::set<std::string>* user_ids) OVERRIDE;
   virtual bool IsWindowOnDesktopOfUser(aura::Window* window,
                                        const std::string& user_id) OVERRIDE;
+  virtual bool ShouldShowAvatar(aura::Window* window) OVERRIDE;
   virtual const std::string& GetUserPresentingWindow(
       aura::Window* window) OVERRIDE;
-  virtual void AddUser(Profile* profile) OVERRIDE;
+  virtual void AddUser(content::BrowserContext* profile) OVERRIDE;
   virtual void AddObserver(Observer* observer) OVERRIDE;
   virtual void RemoveObserver(Observer* observer) OVERRIDE;
 
@@ -126,6 +127,10 @@ bool TestMultiUserWindowManager::IsWindowOnDesktopOfUser(
   return GetUserPresentingWindow(window) == user_id;
 }
 
+bool TestMultiUserWindowManager::ShouldShowAvatar(aura::Window* window) {
+  return false;
+}
+
 const std::string& TestMultiUserWindowManager::GetUserPresentingWindow(
     aura::Window* window) {
   if (window == browser_window_)
@@ -136,7 +141,7 @@ const std::string& TestMultiUserWindowManager::GetUserPresentingWindow(
   return browser_owner_;
 }
 
-void TestMultiUserWindowManager::AddUser(Profile* profile) {
+void TestMultiUserWindowManager::AddUser(content::BrowserContext* profile) {
 }
 
 void TestMultiUserWindowManager::AddObserver(Observer* observer) {