Enable SyncFileSystem API on Stable

chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.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 "base/bind.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "chrome/browser/extensions/event_names.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/sync_file_system/drive_file_sync_service.h"
 #include "chrome/browser/sync_file_system/file_status_observer.h"
 #include "chrome/browser/sync_file_system/local_change_processor.h"
 #include "chrome/browser/sync_file_system/mock_remote_file_sync_service.h"
 #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"
 #include "webkit/fileapi/syncable/sync_status_code.h"
 #include "webkit/fileapi/syncable/syncable_file_system_util.h"
 #include "webkit/quota/quota_manager.h"
 
 using ::testing::_;
 using ::testing::Eq;
 using ::testing::Ne;
 using ::testing::Property;
 using ::testing::Return;
 using fileapi::FileSystemURL;
 using sync_file_system::MockRemoteFileSyncService;
 using sync_file_system::RemoteFileSyncService;
 using sync_file_system::SyncFileSystemServiceFactory;
 
 namespace chrome {
 
 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>;
     SyncFileSystemServiceFactory::GetInstance()->set_mock_remote_file_service(
         scoped_ptr<RemoteFileSyncService>(mock_remote_service_));
 
     ExtensionApiTest::SetUpInProcessBrowserTestFixture();
     // TODO(calvinlo): Update test code after default quota is made const
     // (http://crbug.com/155488).
     real_default_quota_ = quota::QuotaManager::kSyncableStorageDefaultHostQuota;
     quota::QuotaManager::kSyncableStorageDefaultHostQuota = 123456789;
   }
 
   virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
     quota::QuotaManager::kSyncableStorageDefaultHostQuota = real_default_quota_;
   }
 
   ::testing::NiceMock<MockRemoteFileSyncService>* mock_remote_service() {
     return mock_remote_service_;
   }
 
  private:
-  extensions::Feature::ScopedCurrentChannel current_channel_;
   ::testing::NiceMock<MockRemoteFileSyncService>* mock_remote_service_;
   int64 real_default_quota_;
 };
 
 ACTION_P(NotifyOkStateAndCallback, mock_remote_service) {
   mock_remote_service->NotifyRemoteServiceStateUpdated(
       sync_file_system::REMOTE_SERVICE_OK, "Test event description.");
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE, base::Bind(arg1, sync_file_system::SYNC_STATUS_OK));
 }
@@ skipping 106 matching lines @@
   ASSERT_TRUE(RunPlatformAppTest("sync_file_system/write_file_then_get_usage"))
       << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, ConflictResolutionPolicy) {
   ASSERT_TRUE(RunPlatformAppTest("sync_file_system/conflict_resolution_policy"))
       << message_;
 }
 
 }  // namespace chrome