Revert 160362 - Move gpu test_switches.* from content to chrome.

It's not used by content at all, so it can live in chrome instead.

R=jam@chromium.org

Review URL: https://codereview.chromium.org/11035003

TBR=tfarina@chromium.org
Review URL: https://codereview.chromium.org/11040057

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160363 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 65 insertions, 36 deletions

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index fe30366..b79a9de 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -289,6 +289,8 @@
         # production code code in libbrowser (in chrome.gyp).
         #'../content/browser/net/url_request_mock_http_job.cc',
         #'../content/browser/net/url_request_mock_http_job.h',
+        '../content/test/gpu/test_switches.cc',
+        '../content/test/gpu/test_switches.h',
         '../ui/gfx/image/image_unittest_util.h',
         '../ui/gfx/image/image_unittest_util.cc',
         '../webkit/quota/mock_quota_manager.cc',
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 6d2ae66..63f25f4 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -823,9 +823,6 @@ const char kLogNetLog[]                     = "log-net-log";
 // Uninstalls an extension with the specified extension id.
 const char kUninstallExtension[]            = "uninstall-extension";
 
-// Use hardware gpu, if available, for tests.
-const char kUseGpuInTests[] = "use-gpu-in-tests";
-
 // Starts the browser in managed mode.
 const char kManaged[]                       = "managed";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 8250d88..51bef34 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -32,34 +32,34 @@ extern const char kAllowOutdatedPlugins[];
 extern const char kAllowRunningInsecureContent[];
 extern const char kAllowScriptingGallery[];
 extern const char kAlwaysAuthorizePlugins[];
-extern const char kApp[];
 extern const char kAppId[];
+extern const char kApp[];
+extern const char kAppWindowSize[];
 extern const char kAppNotifyChannelServerURL[];
 extern const char kAppsCheckoutURL[];
 extern const char kAppsGalleryDownloadURL[];
 extern const char kAppsGalleryInstallAutoConfirmForTests[];
 extern const char kAppsGalleryReturnTokens[];
-extern const char kAppsGalleryUpdateURL[];
 extern const char kAppsGalleryURL[];
+extern const char kAppsGalleryUpdateURL[];
 extern const char kAppsNewInstallBubble[];
 extern const char kAppsNoThrob[];
-extern const char kAppWindowSize[];
 extern const char kAuthNegotiateDelegateWhitelist[];
 extern const char kAuthSchemes[];
 extern const char kAuthServerWhitelist[];
 extern const char kAutoLaunchAtStartup[];
 extern const char kAutomationClientChannelID[];
 extern const char kAutomationReinitializeOnChannelError[];
-extern const char kCheckCloudPrintConnectorPolicy[];
 extern const char kCheckForUpdateIntervalSec[];
+extern const char kCheckCloudPrintConnectorPolicy[];
 extern const char kChromeFrameShutdownDelay[];
 extern const char kChromeVersion[];
 extern const char kCipherSuiteBlacklist[];
 extern const char kClearTokenService[];
 extern const char kCloudPrintDeleteFile[];
 extern const char kCloudPrintFile[];
-extern const char kCloudPrintFileType[];
 extern const char kCloudPrintJobTitle[];
+extern const char kCloudPrintFileType[];
 extern const char kCloudPrintPrintTicket[];
 extern const char kCloudPrintProxyId[];
 extern const char kCloudPrintServiceURL[];
@@ -89,16 +89,16 @@ extern const char kDisableCRLSets[];
 extern const char kDisableCustomJumpList[];
 extern const char kDisableDefaultApps[];
 extern const char kDisableDhcpWpad[];
-extern const char kDisableExtensions[];
 extern const char kDisableExtensionsFileAccessCheck[];
 extern const char kDisableExtensionsHttpThrottling[];
 extern const char kDisableExtensionsResourceWhitelist[];
+extern const char kDisableExtensions[];
 extern const char kDisableFlashSandbox[];
 extern const char kDisableImprovedDownloadProtection[];
 extern const char kDisableInfiniteCache[];
 extern const char kDisableInternalFlash[];
-extern const char kDisableIPPooling[];
 extern const char kDisableIPv6[];
+extern const char kDisableIPPooling[];
 extern const char kDisableNTPOtherSessionsMenu[];
 extern const char kDisablePopupBlocking[];
 extern const char kDisablePreconnect[];
@@ -107,22 +107,21 @@ extern const char kDisableRestoreBackgroundContents[];
 extern const char kDisableRestoreSessionState[];
 extern const char kDisableScriptedPrintThrottling[];
 extern const char kDisableSync[];
-extern const char kDisableSyncAppNotifications[];
-extern const char kDisableSyncApps[];
 extern const char kDisableSyncAppSettings[];
+extern const char kDisableSyncApps[];
+extern const char kDisableSyncAppNotifications[];
 extern const char kDisableSyncAutofill[];
 extern const char kDisableSyncAutofillProfile[];
 extern const char kDisableSyncBookmarks[];
-extern const char kDisableSyncExtensions[];
 extern const char kDisableSyncExtensionSettings[];
+extern const char kDisableSyncExtensions[];
 extern const char kDisableSyncPasswords[];
 extern const char kDisableSyncPreferences[];
 extern const char kDisableSyncSearchEngines[];
-extern const char kDisableSyncTabs[];
 extern const char kDisableSyncThemes[];
 extern const char kDisableSyncTypedUrls[];
-extern const char kDisableTLSChannelID[];
 extern const char kDisableTranslate[];
+extern const char kDisableTLSChannelID[];
 extern const char kDisableWebResources[];
 extern const char kDisableWebsiteSettings[];
 extern const char kDisableZeroBrowsersOpenForTests[];
@@ -149,13 +148,13 @@ extern const char kEnableExtensionActivityLogging[];
 extern const char kEnableExtensionActivityUI[];
 extern const char kEnableExtensionsInActionBox[];
 extern const char kEnableExtensionTimelineApi[];
-extern const char kEnableFileCookies[];
 extern const char kEnableFramelessConstrainedDialogs[];
+extern const char kEnableFileCookies[];
 extern const char kEnableHttpPipelining[];
 extern const char kEnableInstantExtendedAPI[];
+extern const char kEnableIPv6[];
 extern const char kEnableIPCFuzzing[];
 extern const char kEnableIPPooling[];
-extern const char kEnableIPv6[];
 extern const char kEnableManagedStorage[];
 extern const char kEnableMediaGalleryUI[];
 extern const char kEnableMemoryInfo[];
@@ -165,6 +164,7 @@ extern const char kEnableNaClDebug[];
 extern const char kEnableNaClExceptionHandling[];
 extern const char kEnableNaClIPCProxy[];
 extern const char kEnableNpn[];
+extern const char kDisableSyncTabs[];
 extern const char kEnableNpnHttpOnly[];
 extern const char kEnablePanels[];
 extern const char kEnablePasswordGeneration[];
@@ -189,11 +189,11 @@ extern const char kExplicitlyAllowedPorts[];
 extern const char kExtensionProcess[];
 extern const char kExtensionsUpdateFrequency[];
 extern const char kExternalAutofillPopup[];
+extern const char kFlagSwitchesBegin[];
+extern const char kFlagSwitchesEnd[];
 extern const char kFeedbackServer[];
 extern const char kFileDescriptorLimit[];
 extern const char kFirstRun[];
-extern const char kFlagSwitchesBegin[];
-extern const char kFlagSwitchesEnd[];
 extern const char kGaiaProfileInfo[];
 extern const char kGoogleSearchDomainCheckURL[];
 extern const char kGSSAPILibraryName[];
@@ -201,10 +201,10 @@ extern const char kHelp[];
 extern const char kHelpShort[];
 extern const char kHideIcons[];
 extern const char kHomePage[];
+extern const char kHostRules[];
 extern const char kHostResolverParallelism[];
 extern const char kHostResolverRetryAttempts[];
 extern const char kHstsHosts[];
-extern const char kIgnoreCertificateErrors[];
 extern const char kImport[];
 extern const char kImportFromFile[];
 extern const char kIncognito[];
@@ -213,15 +213,14 @@ extern const char kInstantURL[];
 extern const char kKeepAliveForTest[];
 extern const char kKioskMode[];
 extern const char kKioskModePrinting[];
-extern const char kLoadCloudPolicyOnSignin[];
 extern const char kLoadComponentExtension[];
+extern const char kLoadCloudPolicyOnSignin[];
 extern const char kLoadExtension[];
 extern const char kLoadOpencryptoki[];
+extern const char kUninstallExtension[];
 extern const char kLogNetLog[];
 extern const char kMakeDefaultBrowser[];
 extern const char kManaged[];
-extern const char kMaxSpdyConcurrentStreams[];
-extern const char kMaxSpdySessionsPerDomain[];
 extern const char kMediaCacheSize[];
 extern const char kMemoryProfiling[];
 extern const char kMessageLoopHistogrammer[];
@@ -240,19 +239,19 @@ extern const char kNoFirstRun[];
 extern const char kNoJsRandomness[];
 extern const char kNoManaged[];
 extern const char kNoNetworkProfileWarning[];
-extern const char kNoPings[];
 extern const char kNoProxyServer[];
+extern const char kNoPings[];
 extern const char kNoServiceAutorun[];
 extern const char kNoStartupWindow[];
 extern const char kNotifyCloudPrintTokenExpired[];
 extern const char kNtpAppInstallHint[];
 extern const char kNumPacThreads[];
 extern const char kOmniboxHistoryQuickProviderNewScoring[];
-extern const char kOmniboxHistoryQuickProviderNewScoringDisabled[];
 extern const char kOmniboxHistoryQuickProviderNewScoringEnabled[];
+extern const char kOmniboxHistoryQuickProviderNewScoringDisabled[];
 extern const char kOmniboxHistoryQuickProviderReorderForInlining[];
-extern const char kOmniboxHistoryQuickProviderReorderForInliningDisabled[];
 extern const char kOmniboxHistoryQuickProviderReorderForInliningEnabled[];
+extern const char kOmniboxHistoryQuickProviderReorderForInliningDisabled[];
 extern const char kOmniboxInlineHistoryQuickProvider[];
 extern const char kOmniboxInlineHistoryQuickProviderAllowed[];
 extern const char kOmniboxInlineHistoryQuickProviderProhibited[];
@@ -295,14 +294,15 @@ extern const char kProxyBypassList[];
 extern const char kProxyPacUrl[];
 extern const char kProxyServer[];
 extern const char kPurgeMemoryButton[];
-extern const char kRecordMode[];
 extern const char kRecordStats[];
+extern const char kRecordMode[];
 extern const char kReloadKilledTabs[];
 extern const char kRemoteDebuggingFrontend[];
 extern const char kRendererPrintPreview[];
 extern const char kResetVariationState[];
 extern const char kRestoreLastSession[];
 extern const char kSavePageAsMHTML[];
+extern const char kSbURLPrefix[];
 extern const char kSbDisableAutoUpdate[];
 extern const char kSbDisableDownloadProtection[];
 extern const char kScriptBubbleEnabled[];
@@ -316,10 +316,10 @@ extern const char kShowLauncherAlignmentMenu[];
 extern const char kSilentDumpOnDCHECK[];
 extern const char kSimulateUpgrade[];
 extern const char kSocketReusePolicy[];
-extern const char kSpdyProxyOrigin[];
 extern const char kSpeculativeResourcePrefetching[];
 extern const char kSpeculativeResourcePrefetchingDisabled[];
 extern const char kSpeculativeResourcePrefetchingLearning[];
+extern const char kSpdyProxyOrigin[];
 extern const char kSSLVersionMax[];
 extern const char kSSLVersionMin[];
 extern const char kStartMaximized[];
@@ -329,22 +329,26 @@ extern const char kSuggestionNtpLinearFilter[];
 extern const char kSyncAllowInsecureXmppConnection[];
 extern const char kSyncInvalidateXmppLogin[];
 extern const char kSyncKeystoreEncryption[];
-extern const char kSyncNotificationHostPort[];
+extern const char kSyncShortInitialRetryOverride[];
 extern const char kSyncNotificationMethod[];
+extern const char kSyncNotificationHostPort[];
 extern const char kSyncServiceURL[];
-extern const char kSyncShortInitialRetryOverride[];
 extern const char kSyncTabFavicons[];
 extern const char kSyncThrowUnrecoverableError[];
 extern const char kSyncTrySsltcpFirstForXmpp[];
 extern const char kTabBrowserDragging[];
+extern const char kTestNaClSandbox[];
+extern const char kTestName[];
+extern const char kTestType[];
 extern const char kTestingChannelID[];
 extern const char kTrustedSpdyProxy[];
 extern const char kTryChromeAgain[];
 extern const char kUninstall[];
-extern const char kUninstallExtension[];
-extern const char kUseGpuInTests[];
-extern const char kUserDataDir[];
 extern const char kUseSpdy[];
+extern const char kIgnoreCertificateErrors[];
+extern const char kMaxSpdySessionsPerDomain[];
+extern const char kMaxSpdyConcurrentStreams[];
+extern const char kUserDataDir[];
 extern const char kVariationsServerURL[];
 extern const char kVersion[];
 extern const char kVisitURLs[];
diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc
index 36059bb..6fba303 100644
--- a/chrome/test/gpu/gpu_feature_browsertest.cc
+++ b/chrome/test/gpu/gpu_feature_browsertest.cc
@@ -22,6 +22,7 @@
 #include "content/public/common/gpu_info.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/test/gpu/gpu_test_config.h"
+#include "content/test/gpu/test_switches.h"
 #include "net/base/net_util.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/compositor/compositor_setup.h"
diff --git a/chrome/test/gpu/gpu_pixel_browsertest.cc b/chrome/test/gpu/gpu_pixel_browsertest.cc
index b5c318e..9cf3563 100644
--- a/chrome/test/gpu/gpu_pixel_browsertest.cc
+++ b/chrome/test/gpu/gpu_pixel_browsertest.cc
@@ -15,7 +15,6 @@
 #include "chrome/browser/ui/window_snapshot/window_snapshot.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_version_info.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_launcher_utils.h"
 #include "chrome/test/base/tracing.h"
@@ -24,6 +23,7 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
+#include "content/test/gpu/test_switches.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/test/ppapi/ppapi_test.cc b/chrome/test/ppapi/ppapi_test.cc
index 21ad96b..6e8cf5c 100644
--- a/chrome/test/ppapi/ppapi_test.cc
+++ b/chrome/test/ppapi/ppapi_test.cc
@@ -8,8 +8,8 @@
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
-#include "base/string_util.h"
 #include "base/stringprintf.h"
+#include "base/string_util.h"
 #include "base/test/test_timeouts.h"
 #include "build/build_config.h"
 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
@@ -25,13 +25,14 @@
 #include "chrome/test/base/test_launcher_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/dom_operation_notification_details.h"
+#include "content/public/test/test_renderer_host.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
-#include "content/public/test/test_renderer_host.h"
+#include "content/test/gpu/test_switches.h"
 #include "media/audio/audio_manager.h"
 #include "net/base/net_util.h"
 #include "net/test/test_server.h"
diff --git a/content/test/gpu/test_switches.cc b/content/test/gpu/test_switches.cc
new file mode 100644
index 0000000..edeb8e68
--- /dev/null
+++ b/content/test/gpu/test_switches.cc
@@ -0,0 +1,8 @@
+// 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 "content/test/gpu/test_switches.h"
+
+// Use hardware gpu, if available, for tests.
+const char switches::kUseGpuInTests[] = "use-gpu-in-tests";
diff --git a/content/test/gpu/test_switches.h b/content/test/gpu/test_switches.h
new file mode 100644
index 0000000..1b0605e
--- /dev/null
+++ b/content/test/gpu/test_switches.h
@@ -0,0 +1,16 @@
+// 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.
+
+#ifndef CONTENT_TEST_GPU_TEST_SWITCHES_H_
+#define CONTENT_TEST_GPU_TEST_SWITCHES_H_
+
+namespace switches {
+
+// The switches should be documented alongside the definition of their values
+// in the .cc file.
+extern const char kUseGpuInTests[];
+
+}  // namespace switches
+
+#endif  // CONTENT_TEST_GPU_TEST_SWITCHES_H_