Multi-profile flag cleanup.

chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc

Index: chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc
diff --git a/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc b/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc
index 50b7d2743e454db4dcc7dd1ae55076d6e9403527..64486e82afa66883c48c41ec07c72e1be35f7417 100644
--- a/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc
+++ b/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc
@@ -18,31 +18,13 @@
 #include "chrome/test/base/testing_browser_process.h"
 #include "components/infobars/core/infobar.h"
 
-#if defined(OS_CHROMEOS)
-#include "base/command_line.h"
-#include "chrome/common/chrome_switches.h"
-#endif
-
-#if defined(OS_CHROMEOS)
-// TODO(nkostylev): Cleanup this code once multi-profiles are enabled by
-// default on CrOS. http://crbug.com/351655
-class SessionCrashedInfoBarDelegateUnitTest :
-    public BrowserWithTestWindowTest,
-    public testing::WithParamInterface<bool> {
-#else
 class SessionCrashedInfoBarDelegateUnitTest : public BrowserWithTestWindowTest {
-#endif
  public:
   virtual void SetUp() OVERRIDE {
     static_cast<TestingBrowserProcess*>(g_browser_process)
         ->SetLocalState(&pref_service);
     chrome::RegisterLocalState(pref_service.registry());
 
-#if defined(OS_CHROMEOS)
-    if (GetParam())
-      CommandLine::ForCurrentProcess()->AppendSwitch(switches::kMultiProfiles);
-#endif
-
     // This needs to be called after the local state is set, because it will
     // create a browser which will try to read from the local state.
     BrowserWithTestWindowTest::SetUp();
@@ -57,11 +39,7 @@ class SessionCrashedInfoBarDelegateUnitTest : public BrowserWithTestWindowTest {
   TestingPrefServiceSimple pref_service;
 };
 
-#if defined(OS_CHROMEOS)
-TEST_P(SessionCrashedInfoBarDelegateUnitTest, DetachingTabWithCrashedInfoBar) {
-#else
 TEST_F(SessionCrashedInfoBarDelegateUnitTest, DetachingTabWithCrashedInfoBar) {
-#endif
   SessionServiceFactory::SetForTestProfile(
       browser()->profile(),
       static_cast<SessionService*>(
@@ -112,9 +90,3 @@ TEST_F(SessionCrashedInfoBarDelegateUnitTest, DetachingTabWithCrashedInfoBar) {
   // Ramp down the test.
   tab_strip->CloseWebContentsAt(0, TabStripModel::CLOSE_NONE);
 }
-
-#if defined(OS_CHROMEOS)
-INSTANTIATE_TEST_CASE_P(SessionCrashedInfoBarDelegateUnitTestInstantiation,
-                        SessionCrashedInfoBarDelegateUnitTest,
-                        testing::Bool());
-#endif