Fix MediaClient::RequestCaptureState().

chrome/browser/ui/ash/media_client.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 "chrome/browser/ui/ash/media_client.h"
 
-#include "ash/common/session/session_state_delegate.h"
-#include "ash/common/wm_shell.h"
-#include "ash/content/shell_content_state.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/extensions/media_player_api.h"
 #include "chrome/browser/chromeos/extensions/media_player_event_router.h"
 #include "chrome/browser/media/webrtc/media_stream_capture_indicator.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/ash_util.h"
+#include "chrome/browser/ui/ash/chrome_shell_content_state.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "components/user_manager/user_manager.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/service_manager_connection.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/app_window/app_window_registry.h"
 #include "extensions/browser/process_manager.h"
 #include "services/service_manager/public/cpp/connector.h"
 
 using ash::mojom::MediaCaptureState;
 
@@ skipping 129 matching lines @@
       ->NotifyPrevTrack();
 }
 
 void MediaClient::RequestCaptureState() {
   // TODO(erg): Ash doesn't have stable user indexes. Given the asynchronous
   // nature of sending messages over mojo pipes, this could theoretically cause
   // bad data, as one side thinks the vector is [user1, user2] while the other
   // thinks [user2, user1]. However, since parts of this system are already
   // asynchronous (see OnRequestUpdate's PostTask()), we're not worrying about
   // this right now.
-  ash::SessionStateDelegate* session_state_delegate =
-      ash::WmShell::Get()->GetSessionStateDelegate();
   std::vector<MediaCaptureState> state;
   for (ash::UserIndex i = 0;
-       i < session_state_delegate->NumberOfLoggedInUsers(); ++i) {
+       static_cast<size_t>(i) <

[James Cook, 2017/01/09 21:07:19]

nit: This might be easier to read if |i| was a uint32 and the cast was done
inside the loop

[riajiang, 2017/01/09 23:46:51]

Done.

+       user_manager::UserManager::Get()->GetLoggedInUsers().size();
+       ++i) {
     state.push_back(GetMediaCaptureStateByIndex(i));
   }
 
   media_controller_->NotifyCaptureState(std::move(state));
 }
 
 void MediaClient::OnRequestUpdate(int render_process_id,
                                   int render_frame_id,
                                   content::MediaStreamType stream_type,
                                   const content::MediaRequestState state) {
   DCHECK(base::MessageLoopForUI::IsCurrent());
   // The PostTask is necessary because the state of MediaStreamCaptureIndicator
   // gets updated after this.
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&MediaClient::RequestCaptureState,
                             weak_ptr_factory_.GetWeakPtr()));
 }
 
 MediaCaptureState MediaClient::GetMediaCaptureStateByIndex(int user_index) {
   content::BrowserContext* context =
-      ash::ShellContentState::GetInstance()->GetBrowserContextByIndex(
+      ChromeShellContentState::GetInstance()->GetBrowserContextByIndex(
           user_index);
   return GetMediaCaptureStateOfAllWebContents(context);
 }