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

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 cc9d0ab5a557e1b04708b3aa004046b4162a2b52..8c7d05f1bb5d962a11bd87dac950b8f26afd984f 100644
--- a/chrome/browser/first_run/first_run_browsertest.cc
+++ b/chrome/browser/first_run/first_run_browsertest.cc
@@ -71,7 +71,7 @@ class FirstRunIntegrationBrowserTest : public InProcessBrowserTest {
   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();
 
@@ -120,8 +120,23 @@ class FirstRunMasterPrefsBrowserTest : public FirstRunIntegrationBrowserTest {
 };
 }
 
-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
@@ -129,7 +144,7 @@ IN_PROC_BROWSER_TEST_F(FirstRunIntegrationBrowserTest, WaitForImport) {
 // 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);