Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(106)

Unified Diff: chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc

Issue 12902044: Enable SyncFileSystem API on Stable (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/common/extensions/api/_permission_features.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc
diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc b/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc
index 572d557e8ab1e3c623d2794e27329cc82574e037..f11cf299f4fa6aae674f1e42b56790b4c75f51c2 100644
--- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc
+++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc
@@ -15,7 +15,6 @@
#include "chrome/browser/sync_file_system/sync_file_system_service.h"
#include "chrome/browser/sync_file_system/sync_file_system_service_factory.h"
#include "chrome/common/chrome_version_info.h"
-#include "chrome/common/extensions/features/feature.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/fileapi/file_system_url.h"
@@ -39,11 +38,7 @@ namespace {
class SyncFileSystemApiTest : public ExtensionApiTest {
public:
- // Override the current channel to "trunk" as syncFileSystem is currently
- // available only on trunk channel.
- SyncFileSystemApiTest()
- : current_channel_(VersionInfo::CHANNEL_UNKNOWN) {
- }
+ SyncFileSystemApiTest() {}
virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
mock_remote_service_ = new ::testing::NiceMock<MockRemoteFileSyncService>;
@@ -66,7 +61,6 @@ class SyncFileSystemApiTest : public ExtensionApiTest {
}
private:
- extensions::Feature::ScopedCurrentChannel current_channel_;
::testing::NiceMock<MockRemoteFileSyncService>* mock_remote_service_;
int64 real_default_quota_;
};
« no previous file with comments | « no previous file | chrome/common/extensions/api/_permission_features.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698