Allow chrome trace to be collected when atrace is enabled.

base/debug/trace_event_impl.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 "base/debug/trace_event_impl.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/debug/leak_annotations.h"
@@ skipping 1098 matching lines @@
                flags);
 #endif
 
   TimeTicks now = timestamp - time_offset_;
   EventCallback event_callback_copy;
 
   NotificationHelper notifier(this);
 
   do {
     AutoLock lock(lock_);
-    if (*category_group_enabled != CATEGORY_ENABLED)
+    if (!(*category_group_enabled & CATEGORY_ENABLED))

[dsinclair, 2013/05/29 13:49:20]

Can we pull this out into a method?

if (!isCategoryEnabled(category_group_enabled))

Then a little comment saying, atrace and chrome://tracing are not mutually
exclusive, or something along those lines?

[Xianzhu, 2013/05/29 17:14:31]

Done.

       return;
 
     event_callback_copy = event_callback_;
     if (logged_events_->IsFull())
       break;
 
     const char* new_name = ThreadIdNameManager::GetInstance()->
         GetName(thread_id);
     // Check if the thread name has been set or changed since the previous
     // call (if any), but don't bother if the new name is empty. Note this will
@@ skipping 375 matching lines @@
         NULL,                    // arg_names
         NULL,                    // arg_types
         NULL,                    // arg_values
         NULL,                    // convertable values
         TRACE_EVENT_FLAG_NONE);  // flags
   }
 }
 
 }  // namespace trace_event_internal