Getting rid of GetDefaultProfile & fixing multi user issues with accessibility

chrome/browser/extensions/api/braille_display_private/braille_display_private_api.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/extensions/api/braille_display_private/braille_display_private_api.h"
 
 #include "base/lazy_instance.h"
 #include "chrome/browser/extensions/api/braille_display_private/braille_controller.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 64 matching lines @@
   scoped_ptr<Event> event(new Event(
       OnKeyEvent::kEventName, OnKeyEvent::Create(key_event)));
   event_delegate_->BroadcastEvent(event.Pass());
 }
 
 bool BrailleDisplayPrivateAPI::IsProfileActive() {
 #if defined(OS_CHROMEOS)
   Profile* active_profile;
   chromeos::ScreenLocker* screen_locker =
       chromeos::ScreenLocker::default_screen_locker();
-  if (screen_locker && screen_locker->locked())
+  if (screen_locker && screen_locker->locked()) {
     active_profile = chromeos::ProfileHelper::GetSigninProfile();
-  else
-    active_profile = ProfileManager::GetDefaultProfile();
+  } else {
+    // Since we are creating one instance per profile / user, we should be fine
+    // comparing against the active user. That said - if we ever change that,
+    // this code will need to be changed.
+    active_profile = ProfileManager::GetActiveUserProfile();
+  }
   return profile_->IsSameProfile(active_profile);
 #else  // !defined(OS_CHROMEOS)
   return true;
 #endif
 }
 
 void BrailleDisplayPrivateAPI::SetEventDelegateForTest(
     scoped_ptr<EventDelegate> delegate) {
   event_delegate_ = delegate.Pass();
 }
@@ skipping 67 matching lines @@
 
 void BrailleDisplayPrivateWriteDotsFunction::Work() {
   BrailleController::GetInstance()->WriteDots(params_->cells);
 }
 
 bool BrailleDisplayPrivateWriteDotsFunction::Respond() {
   return true;
 }
 }  // namespace api
 }  // namespace extensions