Remove --enablde-drive-v2-api flag.

chrome/browser/chromeos/drive/change_list_loader.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/chromeos/drive/change_list_loader.h"
 
 #include <set>
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
@@ skipping 171 matching lines @@
         weak_ptr_factory_(this) {
   }
 
   virtual ~FastFetchFeedFetcher() {
   }
 
   virtual void Run(const FeedFetcherCallback& callback) OVERRIDE {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     DCHECK(!callback.is_null());
     DCHECK(!directory_resource_id_.empty());
-    DCHECK(util::IsDriveV2ApiEnabled() || !root_folder_id_.empty());
 
     // Remember the time stamp for usage stats.
     start_time_ = base::TimeTicks::Now();
 
     // We use WAPI's GetResourceListInDirectory even if Drive API v2 is
     // enabled. This is the short term work around of the performance
     // regression.
+    // TODO(hashimoto): Remove this. crbug.com/340931.
 
     std::string resource_id = directory_resource_id_;
-    if (util::IsDriveV2ApiEnabled() &&
-        directory_resource_id_ == root_folder_id_) {
+    if (directory_resource_id_ == root_folder_id_) {
       // GData WAPI doesn't accept the root directory id which is used in Drive
       // API v2. So it is necessary to translate it here.
       resource_id = util::kWapiRootDirectoryResourceId;
     }
 
     scheduler_->GetResourceListInDirectoryByWapi(
         resource_id,
         base::Bind(&FastFetchFeedFetcher::OnResourceListFetched,
                    weak_ptr_factory_.GetWeakPtr(), callback));
   }
 
  private:
   void OnResourceListFetched(
       const FeedFetcherCallback& callback,
       google_apis::GDataErrorCode status,
       scoped_ptr<google_apis::ResourceList> resource_list) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     DCHECK(!callback.is_null());
 
     FileError error = GDataToFileError(status);
     if (error != FILE_ERROR_OK) {
       callback.Run(error, ScopedVector<ChangeList>());
       return;
     }
 
     // Add the current change list to the list of collected lists.
     DCHECK(resource_list);
     ChangeList* change_list = new ChangeList(*resource_list);
-    if (util::IsDriveV2ApiEnabled())
-      FixResourceIdInChangeList(change_list);
+    FixResourceIdInChangeList(change_list);
     change_lists_.push_back(change_list);
 
     GURL next_url;
     if (resource_list->GetNextFeedURL(&next_url) && !next_url.is_empty()) {
       // There is the remaining result so fetch it.
       scheduler_->GetRemainingResourceList(
           next_url,
           base::Bind(&FastFetchFeedFetcher::OnResourceListFetched,
                      weak_ptr_factory_.GetWeakPtr(), callback));
       return;
@@ skipping 743 matching lines @@
   callback.Run(error);
   // Also notify the observers.
   if (error == FILE_ERROR_OK && !directory_path->empty()) {
     FOR_EACH_OBSERVER(ChangeListLoaderObserver, observers_,
                       OnDirectoryChanged(*directory_path));
   }
 }
 
 }  // namespace internal
 }  // namespace drive