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

Side by Side Diff: chrome/browser/chromeos/login/kiosk_browsertest.cc

Issue 19579005: Move ReadFileToString to the base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 174
175 std::string test_gallery_download_url = test_gallery_url; 175 std::string test_gallery_download_url = test_gallery_url;
176 test_gallery_download_url.append("/downloads/%s.crx"); 176 test_gallery_download_url.append("/downloads/%s.crx");
177 command_line->AppendSwitchASCII( 177 command_line->AppendSwitchASCII(
178 ::switches::kAppsGalleryDownloadURL, test_gallery_download_url); 178 ::switches::kAppsGalleryDownloadURL, test_gallery_download_url);
179 } 179 }
180 180
181 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { 181 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
182 base::FilePath test_data_dir; 182 base::FilePath test_data_dir;
183 PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir); 183 PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
184 CHECK(file_util::ReadFileToString(test_data_dir.Append(kServiceLogin), 184 CHECK(base::ReadFileToString(test_data_dir.Append(kServiceLogin),
185 &service_login_response_)); 185 &service_login_response_));
186 186
187 host_resolver()->AddRule(kWebstoreDomain, "127.0.0.1"); 187 host_resolver()->AddRule(kWebstoreDomain, "127.0.0.1");
188 } 188 }
189 189
190 void ReloadKioskApps() { 190 void ReloadKioskApps() {
191 KioskAppManager::Get()->AddApp(kTestKioskApp); 191 KioskAppManager::Get()->AddApp(kTestKioskApp);
192 } 192 }
193 193
194 void ReloadAutolaunchKioskApps() { 194 void ReloadAutolaunchKioskApps() {
195 KioskAppManager::Get()->AddApp(kTestKioskApp); 195 KioskAppManager::Get()->AddApp(kTestKioskApp);
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 content::WindowedNotificationObserver( 416 content::WindowedNotificationObserver(
417 chrome::NOTIFICATION_KIOSK_ENABLED, 417 chrome::NOTIFICATION_KIOSK_ENABLED,
418 content::NotificationService::AllSources()).Wait(); 418 content::NotificationService::AllSources()).Wait();
419 EXPECT_EQ(KioskAppManager::CONSUMER_KIOSK_MODE_ENABLED, 419 EXPECT_EQ(KioskAppManager::CONSUMER_KIOSK_MODE_ENABLED,
420 GetConsumerKioskModeStatus()); 420 GetConsumerKioskModeStatus());
421 } 421 }
422 422
423 INSTANTIATE_TEST_CASE_P(KioskTestInstantiation, KioskTest, testing::Bool()); 423 INSTANTIATE_TEST_CASE_P(KioskTestInstantiation, KioskTest, testing::Bool());
424 424
425 } // namespace chromeos 425 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698