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

Unified Diff: trunk/src/chrome/browser/chromeos/login/wizard_controller_browsertest.cc

Issue 14642018: Revert 197960 "[chromeos] Remove dependencies of StatisticsProvi..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 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: trunk/src/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/login/wizard_controller_browsertest.cc (revision 197968)
+++ trunk/src/chrome/browser/chromeos/login/wizard_controller_browsertest.cc (working copy)
@@ -30,7 +30,6 @@
#include "chrome/common/chrome_paths.h"
#include "chrome/test/base/ui_test_utils.h"
#include "chromeos/chromeos_switches.h"
-#include "chromeos/chromeos_test_utils.h"
#include "grit/generated_resources.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -365,11 +364,11 @@
// Overridden from InProcessBrowserTest:
virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
base::FilePath test_data_dir;
- ASSERT_TRUE(chromeos::test_utils::GetTestDataPath(
- "app_mode", "kiosk_manifest", &test_data_dir));
+ PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
command_line->AppendSwitchPath(
switches::kAppOemManifestFile,
- test_data_dir.AppendASCII("kiosk_manifest.json"));
+ test_data_dir.Append(FILE_PATH_LITERAL(
+ "chromeos/app_mode/kiosk_manifest/kiosk_manifest.json")));
}
private:

Powered by Google App Engine
This is Rietveld 408576698