Turn on client-side phishing detection for UMA users with SafeBrowsing enabled.

chrome/common/chrome_switches.cc

Index: chrome/common/chrome_switches.cc
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 7fcece052b88427695626ee9736c627a88ce3c0e..f970af9cf1c80e2329b0b32b813dd42b7f8b40ac 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -196,6 +196,13 @@ const char kDisableBackgroundNetworking[] = "disable-background-networking";
 const char kDisableBlockContentAnimation[]  =
     "disable-blocked-content-animation";
 
+// This switch is used to disable the client-side phishing detection feature.
+// Note that even if client-side phishing detection is enabled, it will only
+// be active if the user has opted in to UMA stats and SafeBrowsing is enabled
+// in the preferences.
+const char kDisableClientSidePhishingDetection[] =
+    "disable-client-side-phishing-detection";
+
 // Disables establishing a backup TCP connection if a specified timeout is
 // exceeded.
 const char kDisableConnectBackupJobs[]      = "disable-connect-backup-jobs";
@@ -406,13 +413,6 @@ const char kEnableAeroPeekTabs[]            = "enable-aero-peek-tabs";
 // for more background.
 const char kEnableAuthNegotiatePort[]       = "enable-auth-negotiate-port";
 
-// In the browser process this switch is used to enable or disable the
-// client-side phishing detection.  In the renderer this switch is only enabled
-// if this switch is enabled in the browser and the user has opted in to UMA
-// stats and SafeBrowsing is enabled in the preferences.
-const char kEnableClientSidePhishingDetection[] =
-    "enable-client-side-phishing-detection";
-
 // At this point, even if client-side phishing detection is enabled we will not,
 // by default, display an interstitial if we detected a phishing site.  Once
 // we are confident that the false-positive rate is as low as expected we can