Fix the data race of OobeTest.NewUser browser test and enable it.

chrome/browser/chromeos/login/oobe_browsertest.cc

 // Copyright (c) 2013 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/path_service.h"
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/chrome_browser_main_extra_parts.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
@@ skipping 22 matching lines @@
 using namespace google_apis;
 using namespace google_apis::test_server;
 
 namespace {
 
 // Used to add an observer to NotificationService after it's created.
 class TestBrowserMainExtraParts
     : public ChromeBrowserMainExtraParts,
       public content::NotificationObserver {
  public:
-  TestBrowserMainExtraParts() {}
+  TestBrowserMainExtraParts()
+      : webui_visible_(false),
+        browsing_data_removed_(false),
+        signin_screen_shown_(false) {}
   virtual ~TestBrowserMainExtraParts() {}
 
   // ChromeBrowserMainExtraParts implementation.
   virtual void PreEarlyInitialization() OVERRIDE {
     registrar_.Add(this, chrome::NOTIFICATION_LOGIN_WEBUI_VISIBLE,
                    content::NotificationService::AllSources());
     registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED,
                    content::NotificationService::AllSources());
+    registrar_.Add(this, chrome::NOTIFICATION_BROWSING_DATA_REMOVED,
+                   content::NotificationService::AllSources());
   }
 
   void set_quit_task(const base::Closure& quit_task) { quit_task_ = quit_task; }
   void set_gaia_url(const std::string& url) { gaia_url_ = url; }
 
  private:
   // Overridden from content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE {
     if (type == chrome::NOTIFICATION_LOGIN_WEBUI_VISIBLE) {
       LOG(INFO) << "NOTIFICATION_LOGIN_WEBUI_VISIBLE";
-      chromeos::ExistingUserController* controller =
-          chromeos::ExistingUserController::current_controller();
-      CHECK(controller);
-      chromeos::WebUILoginDisplay* webui_login_display =
-          static_cast<chromeos::WebUILoginDisplay*>(
-              controller->login_display());
-      CHECK(webui_login_display);
-      webui_login_display->SetGaiaOriginForTesting(gaia_url_);
-      webui_login_display->ShowSigninScreenForCreds("username", "password");
-      // TODO(glotov): mock GAIA server (test_server_) should support
-      // username/password configuration.
+      webui_visible_ = true;
+      if (browsing_data_removed_ && !signin_screen_shown_) {
+        signin_screen_shown_ = true;
+        ShowSigninScreen();
+      }
+    } else if (type == chrome::NOTIFICATION_BROWSING_DATA_REMOVED) {
+      LOG(INFO) << "chrome::NOTIFICATION_BROWSING_DATA_REMOVED";
+      browsing_data_removed_ = true;
+      if (webui_visible_ && !signin_screen_shown_) {
+        signin_screen_shown_ = true;
+        ShowSigninScreen();
+      }
     } else if (type == chrome::NOTIFICATION_SESSION_STARTED) {
       LOG(INFO) << "chrome::NOTIFICATION_SESSION_STARTED";
       quit_task_.Run();
     } else {
       NOTREACHED();
     }
   }
 
+  void ShowSigninScreen() {
+    chromeos::ExistingUserController* controller =
+        chromeos::ExistingUserController::current_controller();
+    CHECK(controller);
+    chromeos::WebUILoginDisplay* webui_login_display =
+        static_cast<chromeos::WebUILoginDisplay*>(
+            controller->login_display());
+    CHECK(webui_login_display);
+    webui_login_display->SetGaiaOriginForTesting(gaia_url_);
+    webui_login_display->ShowSigninScreenForCreds("username", "password");
+    // TODO(glotov): mock GAIA server (test_server_) should support
+    // username/password configuration.
+  }
+
+  bool webui_visible_, browsing_data_removed_, signin_screen_shown_;
   content::NotificationRegistrar registrar_;
   base::Closure quit_task_;
   std::string gaia_url_;
 
   DISALLOW_COPY_AND_ASSIGN(TestBrowserMainExtraParts);
 };
 
 class TestContentBrowserClient : public chrome::ChromeContentBrowserClient {
  public:
   TestContentBrowserClient() {}
@@ skipping 87 matching lines @@
     return http_response.Pass();
   }
 
   scoped_ptr<TestContentBrowserClient> content_browser_client_;
   content::ContentBrowserClient* original_content_browser_client_;
   std::string service_login_response_;
   HttpServer* test_server_;  // cant use scoped_ptr because destructor
                              // needs UI thread.
 };
 
+// Temporally disabled because of a race: crbug.com/178009

[Nikita (slow), 2013/04/19 07:34:07]

Is this still disabled?

[kjellander_chromium, 2013/04/19 07:38:59]

Confusing. I guess this CL needs a rebase and then remove this comment if it's
re-enabling the test.

[glotov, 2013/04/19 09:21:12]

Done.

 IN_PROC_BROWSER_TEST_F(OobeTest, NewUser) {
   chromeos::WizardController::SkipPostLoginScreensForTesting();
   chromeos::WizardController* wizard_controller =
       chromeos::WizardController::default_controller();
   CHECK(wizard_controller);
   wizard_controller->SkipToLoginForTesting();
 
   scoped_refptr<content::MessageLoopRunner> runner =
       new content::MessageLoopRunner;
   content_browser_client_->browser_main_extra_parts_->set_quit_task(
       runner->QuitClosure());
   runner->Run();
 }
 
 }