Fix the crashing chromeos sync tests and revert the patch that disabled them.

BUG=29994

Review URL: http://codereview.chromium.org/490007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34283 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 10 insertions, 39 deletions

diff --git a/chrome/browser/dom_ui/dom_ui_unittest.cc b/chrome/browser/dom_ui/dom_ui_unittest.cc
index af15610..81df016 100644
--- a/chrome/browser/dom_ui/dom_ui_unittest.cc
+++ b/chrome/browser/dom_ui/dom_ui_unittest.cc
@@ -7,17 +7,6 @@
 #include "chrome/common/url_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-// http://crbug.com/29994
-#if defined(OS_CHROMEOS)
-#define MAYBE_DOMUIToStandard DISABLED_DOMUIToStandard
-#define MAYBE_DOMUIToDOMUI DISABLED_DOMUIToDOMUI
-#define MAYBE_StandardToDOMUI DISABLED_StandardToDOMUI
-#else
-#define MAYBE_DOMUIToStandard DOMUIToStandard
-#define MAYBE_DOMUIToDOMUI DOMUIToDOMUI
-#define MAYBE_StandardToDOMUI StandardToDOMUI
-#endif
-
 class DOMUITest : public RenderViewHostTestHarness {
  public:
   DOMUITest() : ui_thread_(ChromeThread::UI, MessageLoop::current()) {}
@@ -94,7 +83,7 @@ class DOMUITest : public RenderViewHostTestHarness {
 // Tests that the New Tab Page flags are correctly set and propogated by
 // TabContents when we first navigate to a DOM UI page, then to a standard
 // non-DOM-UI page.
-TEST_F(DOMUITest, MAYBE_DOMUIToStandard) {
+TEST_F(DOMUITest, DOMUIToStandard) {
   // The sync service must be created to host the sync NTP advertisement.
   profile_->CreateProfileSyncService();
 
@@ -109,7 +98,7 @@ TEST_F(DOMUITest, MAYBE_DOMUIToStandard) {
   DoNavigationTest(&contents2, 101);
 }
 
-TEST_F(DOMUITest, MAYBE_DOMUIToDOMUI) {
+TEST_F(DOMUITest, DOMUIToDOMUI) {
   // The sync service must be created to host the sync NTP advertisement.
   profile_->CreateProfileSyncService();
 
@@ -129,7 +118,7 @@ TEST_F(DOMUITest, MAYBE_DOMUIToDOMUI) {
   EXPECT_TRUE(contents()->FocusLocationBarByDefault());
 }
 
-TEST_F(DOMUITest, MAYBE_StandardToDOMUI) {
+TEST_F(DOMUITest, StandardToDOMUI) {
   // Start a pending navigation to a regular page.
   GURL std_url("http://google.com/");
 
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index 685903e..37539ef 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -69,7 +69,8 @@ void ProfileSyncService::Initialize() {
   if (!profile()->GetPrefs()->GetBoolean(prefs::kSyncHasSetupCompleted)) {
     DisableForUser();  // Clean up in case of previous crash / setup abort.
 #if defined(OS_CHROMEOS)
-    StartUp();  // We always start sync for Chrome OS.
+    if (profile()->GetRequestContext())
+      StartUp();  // We always start sync for Chrome OS.
 #endif
   } else {
     StartUp();
@@ -114,7 +115,7 @@ void ProfileSyncService::ClearPreferences() {
 
 #if defined(OS_CHROMEOS)
 // The domain and name of the LSID cookie which we use to bootstrap the sync
-// authentication in chromeos.
+// authentication in Chrome OS.
 const char kLsidCookieDomain[] = "www.google.com";
 const char kLsidCookieName[]   = "LSID";
 #endif
diff --git a/chrome/browser/tab_contents/render_view_host_manager_unittest.cc b/chrome/browser/tab_contents/render_view_host_manager_unittest.cc
index e61663b..1cf4e42 100644
--- a/chrome/browser/tab_contents/render_view_host_manager_unittest.cc
+++ b/chrome/browser/tab_contents/render_view_host_manager_unittest.cc
@@ -12,18 +12,6 @@
 #include "ipc/ipc_message.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-// http://crbug.com/29994
-#if defined(OS_CHROMEOS)
-#define MAYBE_NewTabPageProcesses DISABLED_NewTabPageProcesses
-#define MAYBE_AlwaysSendEnableViewSourceMode \
-        DISABLED_AlwaysSendEnableViewSourceMode
-#define MAYBE_DOMUI DISABLED_DOMUI
-#else
-#define MAYBE_NewTabPageProcesses NewTabPageProcesses
-#define MAYBE_AlwaysSendEnableViewSourceMode AlwaysSendEnableViewSourceMode
-#define MAYBE_DOMUI DOMUI
-#endif
-
 class RenderViewHostManagerTest : public RenderViewHostTestHarness {
  public:
   void NavigateActiveAndCommit(const GURL& url) {
@@ -42,7 +30,7 @@ class RenderViewHostManagerTest : public RenderViewHostTestHarness {
 // then do that same thing in another tab, that the two resulting pages have
 // different SiteInstances, BrowsingInstances, and RenderProcessHosts. This is
 // a regression test for bug 9364.
-TEST_F(RenderViewHostManagerTest, MAYBE_NewTabPageProcesses) {
+TEST_F(RenderViewHostManagerTest, NewTabPageProcesses) {
   ChromeThread ui_thread(ChromeThread::UI, MessageLoop::current());
   GURL ntp(chrome::kChromeUINewTabURL);
   GURL dest("http://www.google.com/");
@@ -90,7 +78,7 @@ TEST_F(RenderViewHostManagerTest, MAYBE_NewTabPageProcesses) {
 // mode. See WebFrameImpl::DidFail(). We check by this test that
 // EnableViewSourceMode message is sent on every navigation regardless
 // RenderView is being newly created or reused.
-TEST_F(RenderViewHostManagerTest, MAYBE_AlwaysSendEnableViewSourceMode) {
+TEST_F(RenderViewHostManagerTest, AlwaysSendEnableViewSourceMode) {
   ChromeThread ui_thread(ChromeThread::UI, MessageLoop::current());
   const GURL kNtpUrl(chrome::kChromeUINewTabURL);
   const GURL kUrl("view-source:http://foo");
@@ -241,7 +229,7 @@ TEST_F(RenderViewHostManagerTest, Navigate) {
 }
 
 // Tests DOMUI creation.
-TEST_F(RenderViewHostManagerTest, MAYBE_DOMUI) {
+TEST_F(RenderViewHostManagerTest, DOMUI) {
   ChromeThread ui_thread(ChromeThread::UI, MessageLoop::current());
   SiteInstance* instance = SiteInstance::CreateSiteInstance(profile_.get());
 
diff --git a/chrome/browser/tab_contents/web_contents_unittest.cc b/chrome/browser/tab_contents/web_contents_unittest.cc
index 4e84cb4..9b59406 100644
--- a/chrome/browser/tab_contents/web_contents_unittest.cc
+++ b/chrome/browser/tab_contents/web_contents_unittest.cc
@@ -20,13 +20,6 @@
 #include "ipc/ipc_channel.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-// http://crbug.com/29994
-#if defined(OS_CHROMEOS)
-#define MAYBE_NTPViewSource DISABLED_NTPViewSource
-#else
-#define MAYBE_NTPViewSource NTPViewSource
-#endif
-
 using webkit_glue::PasswordForm;
 
 static void InitNavigateParams(ViewHostMsg_FrameNavigate_Params* params,
@@ -228,7 +221,7 @@ TEST_F(TabContentsTest, UpdateTitle) {
 }
 
 // Test view source mode for the new tabs page.
-TEST_F(TabContentsTest, MAYBE_NTPViewSource) {
+TEST_F(TabContentsTest, NTPViewSource) {
   const char kUrl[] = "view-source:chrome://newtab/";
   const GURL kGURL(kUrl);