Capture the exit status of the first-run AutoImport and make it available to tests.

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 "base/prefs/pref_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/first_run/first_run.h"
@@ skipping 53 matching lines @@
 
 #if !defined(OS_CHROMEOS)
 namespace {
 class FirstRunIntegrationBrowserTest : public InProcessBrowserTest {
  public:
   FirstRunIntegrationBrowserTest() {}
  protected:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     InProcessBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kForceFirstRun);
-    EXPECT_FALSE(ProfileManager::DidPerformProfileImport());
+    EXPECT_FALSE(first_run::DidPerformProfileImport(NULL));
 
     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);
@@ skipping 28 matching lines @@
     FirstRunIntegrationBrowserTest::TearDown();
   }
 
  private:
   base::FilePath prefs_file_;
 
   DISALLOW_COPY_AND_ASSIGN(FirstRunMasterPrefsBrowserTest);
 };
 }
 
-IN_PROC_BROWSER_TEST_F(FirstRunIntegrationBrowserTest, WaitForImport) {
-  ASSERT_TRUE(ProfileManager::DidPerformProfileImport());
+// TODO(tapted): Investigate why this fails on Linux bots but does not

[gab, 2013/03/07 15:35:49]

Perhaps this was the same issue I fixed in http://crrev.com/186367?

[gab, 2013/03/07 15:53:18]

Meh, nvm, this fix was win only.

+// reproduce locally. See http://crbug.com/178062 .
+#if defined(OS_LINUX)
+#define MAYBE_WaitForImport DISABLED_WaitForImport
+#else
+#define MAYBE_WaitForImport WaitForImport
+#endif
+
+IN_PROC_BROWSER_TEST_F(FirstRunIntegrationBrowserTest, MAYBE_WaitForImport) {
+  bool success = false;
+  EXPECT_TRUE(first_run::DidPerformProfileImport(&success));
+  // Aura builds skip over the import process.
+#if defined(USE_AURA)
+  EXPECT_FALSE(success);
+#else
+  EXPECT_TRUE(success);
+#endif
 }
 
 // Test an import with all import options disabled. This is a regression test
 // for http://crbug.com/169984 where this would cause the import process to
 // stay running, and the NTP to be loaded with no apps.
 IN_PROC_BROWSER_TEST_F(FirstRunMasterPrefsBrowserTest,
                        ImportNothingAndShowNewTabPage) {
-  ASSERT_TRUE(ProfileManager::DidPerformProfileImport());
+  EXPECT_TRUE(first_run::DidPerformProfileImport(NULL));
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), GURL(chrome::kChromeUINewTabURL), CURRENT_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   content::WebContents* tab = browser()->tab_strip_model()->GetWebContentsAt(0);
   EXPECT_EQ(1, tab->GetMaxPageID());
 }
 
 #endif  // !defined(OS_CHROMEOS)