Remove Quirks flag, limit server retries

components/quirks/quirks_manager.cc

Index: components/quirks/quirks_manager.cc
diff --git a/components/quirks/quirks_manager.cc b/components/quirks/quirks_manager.cc
index 7f35bc6fa8b8bb0eecb8386312c74fee127dcba0..2ab3c75cbfed205da1dcdaf562890739ace2a235 100644
--- a/components/quirks/quirks_manager.cc
+++ b/components/quirks/quirks_manager.cc
@@ -6,7 +6,6 @@
 
 #include <utility>
 
-#include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/format_macros.h"
 #include "base/memory/ptr_util.h"
@@ -18,7 +17,6 @@
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/quirks/pref_names.h"
 #include "components/quirks/quirks_client.h"
-#include "components/quirks/switches.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "url/gurl.h"
@@ -253,11 +251,6 @@ void QuirksManager::CreateClient(
 }
 
 bool QuirksManager::QuirksEnabled() {
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableQuirksClient)) {
-    VLOG(2) << "Quirks Client disabled by command line flag.";
-    return false;
-  }
   if (!delegate_->DevicePolicyEnabled()) {
     VLOG(2) << "Quirks Client disabled by device policy.";
     return false;