| Index: chrome/browser/profiles/profile_browsertest.cc
|
| diff --git a/chrome/browser/profiles/profile_browsertest.cc b/chrome/browser/profiles/profile_browsertest.cc
|
| index 2a06e5eae029a889a63d83cc46fa8d7a30e03185..0cc502f4ea4b0aa0a8587afc44ff0970963d1ab5 100644
|
| --- a/chrome/browser/profiles/profile_browsertest.cc
|
| +++ b/chrome/browser/profiles/profile_browsertest.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "chrome/browser/profiles/profile.h"
|
|
|
| +#include "base/command_line.h"
|
| #include "base/file_util.h"
|
| #include "base/files/scoped_temp_dir.h"
|
| #include "base/prefs/pref_service.h"
|
| @@ -22,6 +23,10 @@
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| +#if defined(OS_CHROMEOS)
|
| +#include "chromeos/chromeos_switches.h"
|
| +#endif
|
| +
|
| namespace {
|
|
|
| class MockProfileDelegate : public Profile::Delegate {
|
| @@ -84,7 +89,15 @@ void SpinThreads() {
|
|
|
| } // namespace
|
|
|
| -typedef InProcessBrowserTest ProfileBrowserTest;
|
| +class ProfileBrowserTest : public InProcessBrowserTest {
|
| + protected:
|
| + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| +#if defined(OS_CHROMEOS)
|
| + command_line->AppendSwitch(
|
| + chromeos::switches::kIgnoreUserProfileMappingForTests);
|
| +#endif
|
| + }
|
| +};
|
|
|
| // Test OnProfileCreate is called with is_new_profile set to true when
|
| // creating a new profile synchronously.
|
|
|