[Fixit Dec-2012] Refactor first_run, very few things should depend on whether the First Run senti...

chrome/browser/first_run/first_run_browsertest.cc

Index: chrome/browser/first_run/first_run_browsertest.cc
diff --git a/chrome/browser/first_run/first_run_browsertest.cc b/chrome/browser/first_run/first_run_browsertest.cc
index 026b61668a21117044e3308e5281a84695546a4d..fa789ac67ce5a6c30e8dfd083f136edb76c90288 100644
--- a/chrome/browser/first_run/first_run_browsertest.cc
+++ b/chrome/browser/first_run/first_run_browsertest.cc
@@ -59,6 +59,7 @@ IN_PROC_BROWSER_TEST_F(FirstRunBrowserTest, SetShowWelcomePagePref) {
       prefs::kShouldShowWelcomePage));
 }
 
+#if !defined(OS_CHROMEOS)
 namespace {
 class FirstRunIntegrationBrowserTest : public InProcessBrowserTest {
  public:
@@ -66,8 +67,7 @@ class FirstRunIntegrationBrowserTest : public InProcessBrowserTest {
  protected:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     InProcessBrowserTest::SetUpCommandLine(command_line);
-    command_line->AppendSwitch(switches::kFirstRun);
-    command_line->AppendSwitch(switches::kFirstRunForceImport);
+    command_line->AppendSwitch(switches::kForceFirstRun);
     EXPECT_FALSE(ProfileManager::DidPerformProfileImport());
 
     extensions::ComponentLoader::EnableBackgroundExtensionsForTesting();
@@ -85,3 +85,4 @@ class FirstRunIntegrationBrowserTest : public InProcessBrowserTest {
 IN_PROC_BROWSER_TEST_F(FirstRunIntegrationBrowserTest, WaitForImport) {
   ASSERT_TRUE(ProfileManager::DidPerformProfileImport());
 }
+#endif  // !defined(OS_CHROMEOS)