| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 #include "chrome/browser/chromeos/settings/cros_settings.h" | 4 #include "chrome/browser/chromeos/settings/cros_settings.h" |
| 5 #include "chrome/browser/extensions/extension_apitest.h" | 5 #include "chrome/browser/extensions/extension_apitest.h" |
| 6 #include "chromeos/settings/cros_settings_names.h" | 6 #include "chromeos/settings/cros_settings_names.h" |
| 7 | 7 |
| 8 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_ChromeOSInfoPrivateTest) { | 8 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeOSInfoPrivateTest) { |
| 9 // Set the initial timezone to a different one that JS function | 9 // Set the initial timezone to a different one that JS function |
| 10 // timezoneSetTest() will attempt to set. | 10 // timezoneSetTest() will attempt to set. |
| 11 base::StringValue initial_timezone("America/Los_Angeles"); | 11 base::StringValue initial_timezone("America/Los_Angeles"); |
| 12 chromeos::CrosSettings::Get()->Set(chromeos::kSystemTimezone, | 12 chromeos::CrosSettings::Get()->Set(chromeos::kSystemTimezone, |
| 13 initial_timezone); | 13 initial_timezone); |
| 14 | 14 |
| 15 ASSERT_TRUE(RunComponentExtensionTest("chromeos_info_private")) << message_; | 15 ASSERT_TRUE(RunComponentExtensionTest("chromeos_info_private")) << message_; |
| 16 } | 16 } |
| OLD | NEW |