[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

 // Copyright (c) 2012 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 "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ skipping 49 matching lines @@
 }
 
 namespace {
 class FirstRunIntegrationBrowserTest : public InProcessBrowserTest {
  public:
   FirstRunIntegrationBrowserTest() {}
  protected:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     InProcessBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kFirstRun);
-    command_line->AppendSwitch(switches::kFirstRunForceImport);

[Nico, 2012/12/21 21:44:22]

Why is this no longer needed? The CL doesn't mention this. Do you know if QA
uses this flag for testing import?

[gab, 2012/12/21 22:10:35]

This was just added in https://chromiumcodereview.appspot.com/11572036
(literally today...): it seems to only be necessary to force import on "fake
first run" for a browser test added in that CL; now that the two first run
conditions have been unified in one (i.e. that --first-run also means
do_first_run_tasks); this is no longer necessary.

     EXPECT_FALSE(ProfileManager::DidPerformProfileImport());
 
     extensions::ComponentLoader::EnableBackgroundExtensionsForTesting();
 
     // The forked import process should run BrowserMain.
     CommandLine import_arguments((CommandLine::NoProgram()));
     import_arguments.AppendSwitch(content::kLaunchAsBrowser);
     first_run::SetExtraArgumentsForImportProcess(import_arguments);
   }
  private:
   DISALLOW_COPY_AND_ASSIGN(FirstRunIntegrationBrowserTest);
 };
 }
 
 IN_PROC_BROWSER_TEST_F(FirstRunIntegrationBrowserTest, WaitForImport) {
   ASSERT_TRUE(ProfileManager::DidPerformProfileImport());
 }