Turning on MultiProfile by default for ChromeOS

chrome/browser/chromeos/login/kiosk_browsertest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "apps/app_window.h"
 #include "apps/app_window_registry.h"
 #include "apps/ui/native_app_window.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_controller_observer.h"
 #include "ash/shell.h"
@@ skipping 16 matching lines @@
 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"
 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/profiles/profile_impl.h"
+#include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "components/signin/core/common/signin_pref_names.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
@@ skipping 377 matching lines @@
              static_cast<KioskAppManager::ConsumerKioskAutoLaunchStatus>(-1));
     return status;
   }
 
   // Copies the app profile from |relative_app_profile_dir| from test directory
   // to the app profile directory (assuming "user") under testing profile. This
   // is for that needs to have a kiosk app already installed from a previous
   // run. Note this must be called before app profile is loaded.
   void SetupAppProfile(const std::string& relative_app_profile_dir) {
     base::FilePath app_profile_dir;
-    if (CommandLine::ForCurrentProcess()->HasSwitch(
-            ::switches::kMultiProfiles)) {
-      KioskAppManager::App app_data;
-      CHECK(KioskAppManager::Get()->GetApp(test_app_id(), &app_data));
-      std::string app_user_id_hash =
-          CryptohomeClient::GetStubSanitizedUsername(app_data.user_id);
-      app_profile_dir =
-          ProfileHelper::GetProfilePathByUserIdHash(app_user_id_hash);
-    } else {
-      ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &app_profile_dir));
-      app_profile_dir = app_profile_dir.Append(
-          ProfileHelper::GetProfileDirByLegacyLoginProfileSwitch());
-    }
+    KioskAppManager::App app_data;
+    CHECK(KioskAppManager::Get()->GetApp(test_app_id(), &app_data));
+    std::string app_user_id_hash =
+        CryptohomeClient::GetStubSanitizedUsername(app_data.user_id);
+    app_profile_dir =
+        ProfileHelper::GetProfilePathByUserIdHash(app_user_id_hash);
     ASSERT_TRUE(base::CreateDirectory(app_profile_dir));
 
     base::FilePath test_data_dir;
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
     test_data_dir = test_data_dir.AppendASCII(relative_app_profile_dir);
     ASSERT_TRUE(
         base::CopyFile(test_data_dir.Append(chrome::kPreferencesFilename),
                        app_profile_dir.Append(chrome::kPreferencesFilename)));
     ASSERT_TRUE(
         base::CopyDirectory(test_data_dir.AppendASCII("Extensions"),
@@ skipping 745 matching lines @@
   content::WindowedNotificationObserver(
       chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE,
       content::NotificationService::AllSources()).Wait();
 
   // Wait for the wallpaper to load.
   WaitForWallpaper();
   EXPECT_TRUE(wallpaper_loaded());
 }
 
 }  // namespace chromeos