Revert of Move more utility functions to arc_util.

chrome/browser/ui/webui/settings/chromeos/device_storage_handler.cc

 // Copyright 2016 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/webui/settings/chromeos/device_storage_handler.h"
 
 #include <algorithm>
 #include <numeric>
 #include <string>
 
 #include "base/files/file_util.h"
 #include "base/sys_info.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_cache_storage_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_channel_id_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_flash_lso_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_service_worker_helper.h"
 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
-#include "chrome/browser/chromeos/arc/arc_util.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/file_manager/path_util.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/cryptohome/homedir_methods.h"
-#include "components/arc/arc_util.h"
 #include "components/browsing_data/content/conditional_cache_counting_helper.h"
 #include "components/drive/chromeos/file_system_interface.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/text/bytes_formatting.h"
 
 namespace chromeos {
@@ skipping 301 matching lines @@
         base::StringValue(size_string));
   }
 }
 
 void StorageHandler::UpdateAndroidSize() {
   if (updating_android_size_)
     return;
   updating_android_size_ = true;
 
   Profile* const profile = Profile::FromWebUI(web_ui());
-  if (!arc::IsArcAllowedForProfile(profile) ||
-      arc::IsArcOptInVerificationDisabled() ||
+  if (!arc::ArcSessionManager::IsAllowedForProfile(profile) ||
+      arc::ArcSessionManager::IsOptInVerificationDisabled() ||
       !arc::ArcSessionManager::Get()->IsArcEnabled()) {
     return;
   }
 
   // Shows the item "Android apps and cache" and start calculating size.
   CallJavascriptFunction("cr.webUIListenerCallback",
                          base::StringValue("storage-android-enabled-changed"),
                          base::FundamentalValue(true));
   bool success = arc::ArcStorageManager::Get()->GetApplicationsSize(
       base::Bind(&StorageHandler::OnGetAndroidSize,
@@ skipping 19 matching lines @@
                          base::StringValue("storage-android-size-changed"),
                          base::StringValue(size_string));
 }
 
 void StorageHandler::OnClearDriveCacheDone(bool success) {
   UpdateDriveCacheSize();
 }
 
 }  // namespace settings
 }  // namespace chromeos