Change the condition for disabling some tests.

This more accurately reflects where they fail.  There seem to be very few
Google branded Chrome builds that aren't official, but this test fails for
them.

BUG=113399
TEST=Local passage.

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

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

chrome/common/logging_chrome_uitest.cc

@@ -110,7 +110,7 @@ TEST_F(AssertionTest, Assertion) {
 }
 #endif  // !defined(NDEBUG)
 
-#if !defined(OFFICIAL_BUILD)
+#if !defined(GOOGLE_CHROME_BUILD)
 // Only works on Linux in Release mode with CHROME_HEADLESS=1
 class CheckFalseTest : public UITest {
  protected:
@@ -135,7 +135,7 @@ TEST_F(CheckFalseTest, CheckFails) {
   expected_errors_ = EXPECTED_ASSERT_ERRORS;
   expected_crashes_ = EXPECTED_ASSERT_CRASHES;
 }
-#endif  // !defined(OFFICIAL_BUILD)
+#endif  // !defined(GOOGLE_CHROME_BUILD)
 
 // Tests whether we correctly fail on browser crashes during UI Tests.
 class RendererCrashTest : public UITest {