Index: chrome/browser/google_apis/drive_api_util.cc |
diff --git a/chrome/browser/google_apis/drive_api_util.cc b/chrome/browser/google_apis/drive_api_util.cc |
index 6e6c253be0405a1ad009729e6bdad5bacbfd6737..a0274ff2df6fe9b7732134024f31b4f792aba275 100644 |
--- a/chrome/browser/google_apis/drive_api_util.cc |
+++ b/chrome/browser/google_apis/drive_api_util.cc |
@@ -19,16 +19,17 @@ namespace util { |
bool IsDriveV2ApiEnabled() { |
const CommandLine* command_line = CommandLine::ForCurrentProcess(); |
+ |
+ // Disable Drive API v2 by default. |
+ if (!command_line->HasSwitch(switches::kEnableDriveV2Api)) |
+ return false; |
+ |
std::string value = |
command_line->GetSwitchValueASCII(switches::kEnableDriveV2Api); |
StringToLowerASCII(&value); |
- if (value == "false") { |
- return false; |
- } |
- |
- // The value should be empty or "true". |
- DCHECK(value.empty() || value == "true"); |
- return true; |
+ // The value must be "" or "true" for true, or "false" for false. |
+ DCHECK(value.empty() || value == "true" || value == "false"); |
+ return value != "false"; |
} |
} // namespace util |