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

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

Issue 14643006: [chromeos] Remove dependencies of StatisticsProvider on chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: trybots Created 7 years, 7 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/path_service.h" 6 #include "base/path_service.h"
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/browser_shutdown.h" 9 #include "chrome/browser/browser_shutdown.h"
10 #include "chrome/browser/chromeos/cros/cros_library.h" 10 #include "chrome/browser/chromeos/cros/cros_library.h"
(...skipping 12 matching lines...) Expand all
23 #include "chrome/browser/chromeos/login/screens/reset_screen.h" 23 #include "chrome/browser/chromeos/login/screens/reset_screen.h"
24 #include "chrome/browser/chromeos/login/screens/user_image_screen.h" 24 #include "chrome/browser/chromeos/login/screens/user_image_screen.h"
25 #include "chrome/browser/chromeos/login/screens/wrong_hwid_screen.h" 25 #include "chrome/browser/chromeos/login/screens/wrong_hwid_screen.h"
26 #include "chrome/browser/chromeos/login/startup_utils.h" 26 #include "chrome/browser/chromeos/login/startup_utils.h"
27 #include "chrome/browser/chromeos/login/test_login_utils.h" 27 #include "chrome/browser/chromeos/login/test_login_utils.h"
28 #include "chrome/browser/chromeos/login/wizard_controller.h" 28 #include "chrome/browser/chromeos/login/wizard_controller.h"
29 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h" 29 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h"
30 #include "chrome/common/chrome_paths.h" 30 #include "chrome/common/chrome_paths.h"
31 #include "chrome/test/base/ui_test_utils.h" 31 #include "chrome/test/base/ui_test_utils.h"
32 #include "chromeos/chromeos_switches.h" 32 #include "chromeos/chromeos_switches.h"
33 #include "chromeos/chromeos_test_utils.h"
33 #include "grit/generated_resources.h" 34 #include "grit/generated_resources.h"
34 #include "testing/gmock/include/gmock/gmock.h" 35 #include "testing/gmock/include/gmock/gmock.h"
35 #include "testing/gtest/include/gtest/gtest.h" 36 #include "testing/gtest/include/gtest/gtest.h"
36 #include "third_party/icu/public/common/unicode/locid.h" 37 #include "third_party/icu/public/common/unicode/locid.h"
37 #include "ui/base/accelerators/accelerator.h" 38 #include "ui/base/accelerators/accelerator.h"
38 #include "ui/base/l10n/l10n_util.h" 39 #include "ui/base/l10n/l10n_util.h"
39 40
40 namespace chromeos { 41 namespace chromeos {
41 42
42 namespace { 43 namespace {
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 EXPECT_FALSE(ExistingUserController::current_controller() == NULL); 358 EXPECT_FALSE(ExistingUserController::current_controller() == NULL);
358 } 359 }
359 360
360 class WizardControllerKioskFlowTest : public WizardControllerFlowTest { 361 class WizardControllerKioskFlowTest : public WizardControllerFlowTest {
361 protected: 362 protected:
362 WizardControllerKioskFlowTest() {} 363 WizardControllerKioskFlowTest() {}
363 364
364 // Overridden from InProcessBrowserTest: 365 // Overridden from InProcessBrowserTest:
365 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 366 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
366 base::FilePath test_data_dir; 367 base::FilePath test_data_dir;
367 PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir); 368 ASSERT_TRUE(chromeos::test_utils::GetTestDataPath(
369 "app_mode", "kiosk_manifest", &test_data_dir));
368 command_line->AppendSwitchPath( 370 command_line->AppendSwitchPath(
369 switches::kAppOemManifestFile, 371 switches::kAppOemManifestFile,
370 test_data_dir.Append(FILE_PATH_LITERAL( 372 test_data_dir.AppendASCII("kiosk_manifest.json"));
371 "chromeos/app_mode/kiosk_manifest/kiosk_manifest.json")));
372 } 373 }
373 374
374 private: 375 private:
375 DISALLOW_COPY_AND_ASSIGN(WizardControllerKioskFlowTest); 376 DISALLOW_COPY_AND_ASSIGN(WizardControllerKioskFlowTest);
376 }; 377 };
377 378
378 IN_PROC_BROWSER_TEST_F(WizardControllerKioskFlowTest, 379 IN_PROC_BROWSER_TEST_F(WizardControllerKioskFlowTest,
379 ControlFlowKioskForcedEnrollment) { 380 ControlFlowKioskForcedEnrollment) {
380 EXPECT_CALL(*mock_enrollment_screen_->actor(), 381 EXPECT_CALL(*mock_enrollment_screen_->actor(),
381 SetParameters(mock_enrollment_screen_, 382 SetParameters(mock_enrollment_screen_,
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 } 419 }
419 420
420 // TODO(dzhioev): Add test emaulating device with wrong HWID. 421 // TODO(dzhioev): Add test emaulating device with wrong HWID.
421 422
422 // TODO(nkostylev): Add test for WebUI accelerators http://crosbug.com/22571 423 // TODO(nkostylev): Add test for WebUI accelerators http://crosbug.com/22571
423 424
424 COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 15, 425 COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 15,
425 add_tests_for_new_control_flow_you_just_introduced); 426 add_tests_for_new_control_flow_you_just_introduced);
426 427
427 } // namespace chromeos 428 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698