Change the condition for disabling some tests.

chrome/common/logging_chrome_uitest.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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 92 matching lines @@
 #elif defined(OS_MACOSX)
 // Crash service doesn't exist for the Mac yet: http://crbug.com/45243
 #define Assertion DISABLED_Assertion
 #endif
 TEST_F(AssertionTest, Assertion) {
   expected_errors_ = EXPECTED_ASSERT_ERRORS;
   expected_crashes_ = EXPECTED_ASSERT_CRASHES;
 }
 #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:
   CheckFalseTest() {
 #if defined(OS_WIN)
     // TODO(phajdan.jr): Make crash notifications on launch work on Win.
     wait_for_initial_loads_ = false;
 #endif
     launch_arguments_.AppendSwitch(switches::kRendererCheckFalseTest);
   }
 };
 
 #if defined(OS_WIN)
 // http://crbug.com/38497
 #define CheckFails DISABLED_CheckFails
 #elif defined(OS_MACOSX)
 // Crash service doesn't exist for the Mac yet: http://crbug.com/45243
 #define CheckFails DISABLED_CheckFails
 #endif
 // Launch the app in assertion test mode, then close the app.
 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 {
  protected:
   RendererCrashTest() {
 #if defined(OS_WIN)
     // TODO(phajdan.jr): Make crash notifications on launch work on Win.
     wait_for_initial_loads_ = false;
 #endif
     launch_arguments_.AppendSwitch(switches::kRendererCrashTest);
@@ skipping 15 matching lines @@
 #else
 #define MAYBE_Crash Crash
 #endif
 // Launch the app in renderer crash test mode, then close the app.
 TEST_F(RendererCrashTest, MAYBE_Crash) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   ASSERT_TRUE(browser->WaitForTabCountToBecome(1));
   expected_crashes_ = EXPECTED_CRASH_CRASHES;
 }