Enable the Website Settings UI by default on trunk.

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 85970e3b7075ce7475a9b0b7af5f7bbbe5afb24a..58ca9cfc74a0083729eebe61144e493d36970354 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -424,6 +424,9 @@ const char kDisableTranslate[]              = "disable-translate";
 // Disables the backend service for web resources.
 const char kDisableWebResources[]           = "disable-web-resources";
 
+// Disables the website settings UI.
+const char kDisableWebsiteSettings[]         = "disable-website-settings";
+
 // Some tests seem to require the application to close when the last
 // browser window is closed. Thus, we need a switch to force this behavior
 // for ChromeOS Aura, disable "zero window mode".
@@ -665,10 +668,6 @@ const char kEnableTextServiceFramework[] = "enable-text-service-framework";
 // Order of the listed sub-arguments does not matter.
 const char kEnableWatchdog[]                = "enable-watchdog";
 
-// Enable Website Settings. The Website Settings UI will replace the Page Info
-// Bubble.
-const char kEnableWebsiteSettings[]         = "enable-website-settings";
-
 // Uses WebSocket over SPDY.
 const char kEnableWebSocketOverSpdy[]       = "enable-websocket-over-spdy";