5 files changed, 7 insertions, 8 deletions
diff --git a/chrome/browser/chromeos/system/statistics_provider.cc b/chrome/browser/chromeos/system/statistics_provider.cc
index 81bf298..a2de9bd 100644
--- a/chrome/browser/chromeos/system/statistics_provider.cc
+++ b/chrome/browser/chromeos/system/statistics_provider.cc
@@ -14,11 +14,10 @@
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"
-#include "base/chromeos/chromeos_version.h"
 #include "chrome/browser/chromeos/system/name_value_pairs_parser.h"
 #include "chrome/common/child_process_logging.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
+#include "chromeos/chromeos_switches.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
@@ -214,9 +213,9 @@ class StatisticsProviderStubImpl : public StatisticsProvider {
                                    std::string* result) OVERRIDE {
     if (name == "CHROMEOS_RELEASE_BOARD") {
       const CommandLine* command_line = CommandLine::ForCurrentProcess();
-      if (command_line->HasSwitch(switches::kChromeOSReleaseBoard)) {
+      if (command_line->HasSwitch(chromeos::switches::kChromeOSReleaseBoard)) {
         *result = command_line->
-            GetSwitchValueASCII(switches::kChromeOSReleaseBoard);
+            GetSwitchValueASCII(chromeos::switches::kChromeOSReleaseBoard);
         return true;
       }
     }
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 24e27a4..a93f9be 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -1484,9 +1484,6 @@ const char kEnterpriseEnrollmentInitialModulus[] =
 const char kEnterpriseEnrollmentModulusLimit[] =
     "enterprise-enrollment-modulus-limit";
 
-// Enables overriding the Chrome OS board type when running on Linux.
-const char kChromeOSReleaseBoard[]          = "chromeos-release-board";
-
 #ifndef NDEBUG
 // Skips all other OOBE pages after user login.
 const char kOobeSkipPostLogin[]             = "oobe-skip-postlogin";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 9a0e337..84c1dea 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -406,7 +406,6 @@ extern const char kStubCrosSettings[];
 extern const char kAuthExtensionPath[];
 extern const char kEnterpriseEnrollmentInitialModulus[];
 extern const char kEnterpriseEnrollmentModulusLimit[];
-extern const char kChromeOSReleaseBoard[];
 #ifndef NDEBUG
 extern const char kOobeSkipPostLogin[];
 #endif
diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc
index 2ade84b..8cb93ae 100644
--- a/chromeos/chromeos_switches.cc
+++ b/chromeos/chromeos_switches.cc
@@ -13,5 +13,8 @@ const char kDbusStub[] = "dbus-stub";
 // Sends test messages on first call to RequestUpdate (stub only).
 const char kSmsTestMessages[] = "sms-test-messages";
 
+// Enables overriding the Chrome OS board type when running on Linux.
+const char kChromeOSReleaseBoard[] = "chromeos-release-board";
+
 }  // namespace switches
 }  // namespace chromeos
diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h
index 29658f3e..4a7e9f6 100644
--- a/chromeos/chromeos_switches.h
+++ b/chromeos/chromeos_switches.h
@@ -22,6 +22,7 @@ namespace switches {
 // Please keep alphabetized.
 CHROMEOS_EXPORT extern const char kDbusStub[];
 CHROMEOS_EXPORT extern const char kSmsTestMessages[];
+CHROMEOS_EXPORT extern const char kChromeOSReleaseBoard[];
 
 }  // namespace switches
 }  // namespace chromeos