| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/apps/drive/drive_app_provider.h" | 5 #include "chrome/browser/apps/drive/drive_app_provider.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 | 84 |
| 85 DISALLOW_COPY_AND_ASSIGN(FakeUninstallSyncService); | 85 DISALLOW_COPY_AND_ASSIGN(FakeUninstallSyncService); |
| 86 }; | 86 }; |
| 87 | 87 |
| 88 } // namespace | 88 } // namespace |
| 89 | 89 |
| 90 class DriveAppProviderTest : public ExtensionBrowserTest, | 90 class DriveAppProviderTest : public ExtensionBrowserTest, |
| 91 public extensions::InstallObserver { | 91 public extensions::InstallObserver { |
| 92 public: | 92 public: |
| 93 DriveAppProviderTest() {} | 93 DriveAppProviderTest() {} |
| 94 virtual ~DriveAppProviderTest() {} | 94 ~DriveAppProviderTest() override {} |
| 95 | 95 |
| 96 // ExtensionBrowserTest: | 96 // ExtensionBrowserTest: |
| 97 void SetUpOnMainThread() override { | 97 void SetUpOnMainThread() override { |
| 98 ExtensionBrowserTest::SetUpOnMainThread(); | 98 ExtensionBrowserTest::SetUpOnMainThread(); |
| 99 | 99 |
| 100 fake_drive_service_.reset(new drive::FakeDriveService); | 100 fake_drive_service_.reset(new drive::FakeDriveService); |
| 101 fake_drive_service_->LoadAppListForDriveApi("drive/applist_empty.json"); | 101 fake_drive_service_->LoadAppListForDriveApi("drive/applist_empty.json"); |
| 102 apps_registry_.reset( | 102 apps_registry_.reset( |
| 103 new drive::DriveAppRegistry(fake_drive_service_.get())); | 103 new drive::DriveAppRegistry(fake_drive_service_.get())); |
| 104 | 104 |
| (...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 574 chrome_app_id, ExtensionRegistry::EVERYTHING)); | 574 chrome_app_id, ExtensionRegistry::EVERYTHING)); |
| 575 | 575 |
| 576 // Uninstall is removed from sync and the app is added again. | 576 // Uninstall is removed from sync and the app is added again. |
| 577 provider()->RemoveUninstalledDriveAppFromSync(kDriveAppId); | 577 provider()->RemoveUninstalledDriveAppFromSync(kDriveAppId); |
| 578 WaitForPendingDriveAppConverters(); | 578 WaitForPendingDriveAppConverters(); |
| 579 chrome_app_id = mapping()->GetChromeApp(kDriveAppId); | 579 chrome_app_id = mapping()->GetChromeApp(kDriveAppId); |
| 580 EXPECT_FALSE(chrome_app_id.empty()); | 580 EXPECT_FALSE(chrome_app_id.empty()); |
| 581 EXPECT_TRUE(ExtensionRegistry::Get(profile())->GetExtensionById( | 581 EXPECT_TRUE(ExtensionRegistry::Get(profile())->GetExtensionById( |
| 582 chrome_app_id, ExtensionRegistry::EVERYTHING)); | 582 chrome_app_id, ExtensionRegistry::EVERYTHING)); |
| 583 } | 583 } |
| OLD | NEW |