Replace kChromeOSReleaseBoard with SysInfo::GetLsbReleaseBoard()

sync/util/get_session_name_unittest.cc

 // 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 <string>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
+#include "base/sys_info.h"
 #include "sync/util/get_session_name.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/command_line.h"
 #include "chromeos/chromeos_switches.h"
 #endif  // OS_CHROMEOS
 
 namespace syncer {
 
@@ skipping 16 matching lines @@
 TEST_F(GetSessionNameTest, GetSessionNameSynchronously) {
   const std::string& session_name = GetSessionNameSynchronouslyForTesting();
   EXPECT_FALSE(session_name.empty());
 }
 
 #if defined(OS_CHROMEOS)
 
 // Call GetSessionNameSynchronouslyForTesting on ChromeOS where the board type
 // is "lumpy-signed-mp-v2keys" and make sure the return value is "Chromebook".
 TEST_F(GetSessionNameTest, GetSessionNameSynchronouslyChromebook) {
-  // This test cannot be run on a real CrOs device, since it will already have a
-  // board type, and we cannot override it.
-  // TODO(rsimha): Rewrite this test once http://crbug.com/126732 is fixed.
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(chromeos::switches::kChromeOSReleaseBoard))
-    return;
-
-  command_line->AppendSwitchASCII(chromeos::switches::kChromeOSReleaseBoard,
-                                  "lumpy-signed-mp-v2keys");
+  const char* kLsbRelease = "CHROMEOS_RELEASE_BOARD=lumpy-signed-mp-v2keys\n";
+  base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease, base::Time());
   const std::string& session_name = GetSessionNameSynchronouslyForTesting();
   EXPECT_EQ("Chromebook", session_name);
 }
 
 // Call GetSessionNameSynchronouslyForTesting on ChromeOS where the board type
 // is "stumpy-signed-mp-v2keys" and make sure the return value is "Chromebox".
 TEST_F(GetSessionNameTest, GetSessionNameSynchronouslyChromebox) {
-  // This test cannot be run on a real CrOs device, since it will already have a
-  // board type, and we cannot override it.
-  // TODO(rsimha): Rewrite this test once http://crbug.com/126732 is fixed.
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(chromeos::switches::kChromeOSReleaseBoard))
-    return;
-
-  command_line->AppendSwitchASCII(chromeos::switches::kChromeOSReleaseBoard,
-                                  "stumpy-signed-mp-v2keys");
+  const char* kLsbRelease = "CHROMEOS_RELEASE_BOARD=stumpy-signed-mp-v2keys\n";
+  base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease, base::Time());
   const std::string& session_name = GetSessionNameSynchronouslyForTesting();
   EXPECT_EQ("Chromebox", session_name);
 }
 
 #endif  // OS_CHROMEOS
 
 // Calls GetSessionName and runs the message loop until it comes back
 // with a session name.  Makes sure the returned session name is equal
 // to the return value of GetSessionNameSynchronouslyForTesting().
 TEST_F(GetSessionNameTest, GetSessionName) {
   GetSessionName(message_loop_.message_loop_proxy(),
                  base::Bind(&GetSessionNameTest::SetSessionNameAndQuit,
                             base::Unretained(this)));
   message_loop_.Run();
   EXPECT_EQ(session_name_, GetSessionNameSynchronouslyForTesting());
 }
 
 }  // namespace
 
 }  // namespace syncer