Replace directly use of DriveIntegrationService to drive::util::GetXxxByProfile.

chrome/browser/ui/webui/chromeos/drive_internals_ui.cc

 // Copyright (c) 2012 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/chromeos/drive_internals_ui.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
@@ skipping 197 matching lines @@
   virtual ~DriveInternalsWebUIHandler() {
   }
 
  private:
   // WebUIMessageHandler override.
   virtual void RegisterMessages() OVERRIDE;
 
   // Returns a DriveIntegrationService.
   drive::DriveIntegrationService* GetIntegrationService();
 
+  // Returns a DriveService instance.
+  drive::DriveServiceInterface* GetDriveService();
+
+  // Returns a FileSystem instance.
+  drive::FileSystemInterface* GetFileSystem();
+
   // Called when the page is first loaded.
   void OnPageLoaded(const base::ListValue* args);
 
   // Updates respective sections.
   void UpdateDriveRelatedFlagsSection();
   void UpdateDriveRelatedPreferencesSection();
   void UpdateAuthStatusSection(
       drive::DriveServiceInterface* drive_service);
   void UpdateAboutResourceSection(
       drive::DriveServiceInterface* drive_service);
@@ skipping 139 matching lines @@
   web_ui()->RegisterMessageCallback(
       "listFileEntries",
       base::Bind(&DriveInternalsWebUIHandler::ListFileEntries,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 drive::DriveIntegrationService*
 DriveInternalsWebUIHandler::GetIntegrationService() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
+  // TODO(hidehiko): GetForProfile will return the instance always even if it
+  // is disabled. Needs to check the mounting state then. crbug.com/284972.
   Profile* profile = Profile::FromWebUI(web_ui());
   return drive::DriveIntegrationServiceFactory::GetForProfile(profile);
 }
 
+drive::DriveServiceInterface* DriveInternalsWebUIHandler::GetDriveService() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  Profile* profile = Profile::FromWebUI(web_ui());
+  return drive::util::GetDriveServiceByProfile(profile);
+}
+
+drive::FileSystemInterface* DriveInternalsWebUIHandler::GetFileSystem() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  Profile* profile = Profile::FromWebUI(web_ui());
+  return drive::util::GetFileSystemByProfile(profile);
+}
+
 void DriveInternalsWebUIHandler::OnPageLoaded(const base::ListValue* args) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   drive::DriveIntegrationService* integration_service =
       GetIntegrationService();
   // |integration_service| may be NULL in the guest/incognito mode.
   if (!integration_service)
     return;
 
   drive::DriveServiceInterface* drive_service =
@@ skipping 124 matching lines @@
   base::DictionaryValue local_metadata;
   local_metadata.SetDouble("account-largest-changestamp-local",
                            metadata.largest_changestamp);
   local_metadata.SetBoolean("account-metadata-refreshing", metadata.refreshing);
   web_ui()->CallJavascriptFunction("updateLocalMetadata", local_metadata);
 }
 
 void DriveInternalsWebUIHandler::ClearAccessToken(const base::ListValue* args) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  drive::DriveIntegrationService* integration_service =
-      GetIntegrationService();
-  if (!integration_service)
-    return;
-  integration_service->drive_service()->ClearAccessToken();
+  drive::DriveServiceInterface* drive_service = GetDriveService();
+  if (drive_service)
+    drive_service->ClearAccessToken();
 }
 
 void DriveInternalsWebUIHandler::ClearRefreshToken(
     const base::ListValue* args) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  drive::DriveIntegrationService* integration_service =
-      GetIntegrationService();
-  if (!integration_service)
-    return;
-  integration_service->drive_service()->ClearRefreshToken();
+  drive::DriveServiceInterface* drive_service = GetDriveService();
+  if (drive_service)
+    drive_service->ClearRefreshToken();
 }
 
 void DriveInternalsWebUIHandler::ListFileEntries(const base::ListValue* args) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   UpdateFileSystemContentsSection();
 }
 
 void DriveInternalsWebUIHandler::UpdateDeltaUpdateStatusSection(
     drive::DebugInfoCollector* debug_info_collector) {
@@ skipping 72 matching lines @@
                  gcache_summary),
       base::Bind(&DriveInternalsWebUIHandler::OnGetGCacheContents,
                  weak_ptr_factory_.GetWeakPtr(),
                  base::Owned(gcache_contents),
                  base::Owned(gcache_summary)));
 }
 
 void DriveInternalsWebUIHandler::UpdateFileSystemContentsSection() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  drive::DriveIntegrationService* integration_service =
-      GetIntegrationService();
-  if (!integration_service)
+  drive::DriveServiceInterface* drive_service = GetDriveService();
+  drive::FileSystemInterface* file_system = GetFileSystem();
+  if (!drive_service || !file_system)
     return;
+
   // Start updating the file system tree section, if we have access token.
-  if (!integration_service->drive_service()->HasAccessToken())
+  if (!drive_service->HasAccessToken())
     return;
 
   // Start rendering the file system tree as text.
   const base::FilePath root_path = drive::util::GetDriveGrandRootPath();
 
-  integration_service->file_system()->GetResourceEntryByPath(
+  file_system->GetResourceEntryByPath(
       root_path,
       base::Bind(&DriveInternalsWebUIHandler::OnGetResourceEntryByPath,
                  weak_ptr_factory_.GetWeakPtr(),
                  root_path));
 
-  integration_service->file_system()->ReadDirectoryByPath(
+  file_system->ReadDirectoryByPath(
       root_path,
       base::Bind(&DriveInternalsWebUIHandler::OnReadDirectoryByPath,
                  weak_ptr_factory_.GetWeakPtr(),
                  root_path));
 }
 
 void DriveInternalsWebUIHandler::UpdateLocalStorageUsageSection() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Propagate the amount of local free space in bytes.
@@ skipping 75 matching lines @@
 
 void DriveInternalsWebUIHandler::OnReadDirectoryByPath(
     const base::FilePath& parent_path,
     drive::FileError error,
     scoped_ptr<drive::ResourceEntryVector> entries) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (error == drive::FILE_ERROR_OK) {
     DCHECK(entries.get());
 
+    drive::FileSystemInterface* file_system = GetFileSystem();
     std::string file_system_as_text;
     for (size_t i = 0; i < entries->size(); ++i) {
       const drive::ResourceEntry& entry = (*entries)[i];
       const base::FilePath current_path = parent_path.Append(
           base::FilePath::FromUTF8Unsafe(entry.base_name()));
 
       file_system_as_text.append(FormatEntry(current_path, entry) + "\n");
 
       if (entry.file_info().is_directory()) {
-        GetIntegrationService()->file_system()->ReadDirectoryByPath(
+        file_system->ReadDirectoryByPath(
             current_path,
             base::Bind(&DriveInternalsWebUIHandler::OnReadDirectoryByPath,
                        weak_ptr_factory_.GetWeakPtr(),
                        current_path));
       }
     }
 
     // There may be pending ReadDirectoryByPath() calls, but we can update
     // the page with what we have now. This results in progressive
     // updates, which is good for a large file system.
@@ skipping 50 matching lines @@
       content::WebUIDataSource::Create(chrome::kChromeUIDriveInternalsHost);
   source->AddResourcePath("drive_internals.css", IDR_DRIVE_INTERNALS_CSS);
   source->AddResourcePath("drive_internals.js", IDR_DRIVE_INTERNALS_JS);
   source->SetDefaultResource(IDR_DRIVE_INTERNALS_HTML);
 
   Profile* profile = Profile::FromWebUI(web_ui);
   content::WebUIDataSource::Add(profile, source);
 }
 
 }  // namespace chromeos