mediaview: Fix ARC file system operation deferring.

chrome/browser/chromeos/arc/fileapi/arc_file_system_operation_runner.cc

 // Copyright 2017 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/chromeos/arc/fileapi/arc_file_system_operation_runner.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/optional.h"
@@ skipping 11 matching lines @@
 const char ArcFileSystemOperationRunner::kArcServiceName[] =
     "arc::ArcFileSystemOperationRunner";
 
 // static
 std::unique_ptr<ArcFileSystemOperationRunner>
 ArcFileSystemOperationRunner::CreateForTesting(
     ArcBridgeService* bridge_service) {
   // We can't use base::MakeUnique() here because we are calling a private
   // constructor.
   return base::WrapUnique<ArcFileSystemOperationRunner>(
-      new ArcFileSystemOperationRunner(bridge_service, false));
+      new ArcFileSystemOperationRunner(bridge_service, nullptr, false));
 }
 
 ArcFileSystemOperationRunner::ArcFileSystemOperationRunner(
-    ArcBridgeService* bridge_service)
-    : ArcFileSystemOperationRunner(bridge_service, true) {}
+    ArcBridgeService* bridge_service,
+    const Profile* profile)
+    : ArcFileSystemOperationRunner(bridge_service, profile, true) {
+  DCHECK(profile);
+}
 
 ArcFileSystemOperationRunner::ArcFileSystemOperationRunner(
     ArcBridgeService* bridge_service,
+    const Profile* profile,
     bool observe_events)
     : ArcService(bridge_service),
+      profile_(profile),
       observe_events_(observe_events),
       weak_ptr_factory_(this) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (observe_events_) {
     ArcSessionManager::Get()->AddObserver(this);
     arc_bridge_service()->file_system()->AddObserver(this);
     OnStateChanged();
   }
 }
@@ skipping 102 matching lines @@
   OnStateChanged();
 }
 
 void ArcFileSystemOperationRunner::OnInstanceClosed() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   OnStateChanged();
 }
 
 void ArcFileSystemOperationRunner::OnStateChanged() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  // TODO(hidehiko): Revisit the condition, when ARC is running without
-  // profile.
-  SetShouldDefer(
-      IsArcPlayStoreEnabledForProfile(ArcSessionManager::Get()->profile()) &&
-      !arc_bridge_service()->file_system()->has_instance());
+  SetShouldDefer(IsArcPlayStoreEnabledForProfile(profile_) &&
+                 !arc_bridge_service()->file_system()->has_instance());
 }
 
 void ArcFileSystemOperationRunner::SetShouldDefer(bool should_defer) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   should_defer_ = should_defer;
 
   if (should_defer_)
     return;
 
   // Run deferred operations.
   std::vector<base::Closure> deferred_operations;
   deferred_operations.swap(deferred_operations_);
   for (const base::Closure& operation : deferred_operations) {
     operation.Run();
   }
 
   // No deferred operations should be left at this point.
   DCHECK(deferred_operations_.empty());
 }
 
 }  // namespace arc