Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6134)

Unified Diff: chrome/browser/ui/views/ash/status_area_host_aura_browsertest.cc

Issue 9546013: Move IsRunningOnChromeOS to base/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chromeos_version,sync,cleanup Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/ash/status_area_host_aura_browsertest.cc
diff --git a/chrome/browser/ui/views/ash/status_area_host_aura_browsertest.cc b/chrome/browser/ui/views/ash/status_area_host_aura_browsertest.cc
index 65acd1ee806e860d3a1511da6c7daf57a618d4fe..797fd9a38a28c0fd0697c2f566f06b7f4579b9e7 100644
--- a/chrome/browser/ui/views/ash/status_area_host_aura_browsertest.cc
+++ b/chrome/browser/ui/views/ash/status_area_host_aura_browsertest.cc
@@ -7,7 +7,6 @@
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/chromeos/status/status_area_button.h"
#include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/chromeos/system/runtime_environment.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
@@ -20,6 +19,7 @@
#include "ui/gfx/size.h"
#if defined(OS_CHROMEOS)
+#include "base/chromeos/chromeos_version.h"
#include "chrome/browser/chromeos/login/screen_locker.h"
#include "chrome/browser/chromeos/login/screen_locker_tester.h"
#include "chrome/browser/chromeos/login/user_manager.h"
@@ -34,7 +34,7 @@ IN_PROC_BROWSER_TEST_F(StatusAreaHostAuraTest, TextStyle) {
#if defined(OS_CHROMEOS)
ASSERT_FALSE(chromeos::UserManager::Get()->IsUserLoggedIn());
- if (chromeos::system::runtime_environment::IsRunningOnChromeOS()) {
+ if (base::chromeos::IsRunningOnChromeOS()) {
EXPECT_EQ(StatusAreaButton::GRAY_PLAIN_LIGHT,
host->GetStatusAreaTextStyle());
} else {
« no previous file with comments | « chrome/browser/ui/views/ash/status_area_host_aura.cc ('k') | chrome/browser/ui/views/frame/browser_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698