MacViews: Fix gn check fail for mac_views_browser on Aura dependencies.

ui/views/test/scoped_views_test_helper.cc

 // Copyright 2015 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 "ui/views/test/scoped_views_test_helper.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/compositor/test/context_factories_for_test.h"
 #include "ui/views/test/platform_test_helper.h"
 #include "ui/views/test/test_views_delegate.h"
 #include "ui/views/test/views_test_helper.h"
 
 #if defined(USE_AURA)
-#include "ui/aura/env.h"
+#include "ui/aura/env.h"  // nogncheck
 #endif
 
 namespace views {
 
 ScopedViewsTestHelper::ScopedViewsTestHelper()
     : ScopedViewsTestHelper(base::WrapUnique(new TestViewsDelegate)) {}
 
 ScopedViewsTestHelper::ScopedViewsTestHelper(
     std::unique_ptr<TestViewsDelegate> views_delegate)
     : views_delegate_(std::move(views_delegate)),
       platform_test_helper_(PlatformTestHelper::Create()) {
   // The ContextFactory must exist before any Compositors are created.
   bool enable_pixel_output = false;
 #if defined(USE_AURA)
   ui::ContextFactory* old_context_factory = nullptr;

[tapted, 2016/09/19 03:23:36]

This looks like it could easily be moved to ViewsTestHelperAura::SetUp() - this
block just needs to happen before the call to AuraTestHelper::SetUp(), and the
block below happens after.

   if (PlatformTestHelper::IsMus()) {
     old_context_factory = aura::Env::GetInstance()->context_factory();
     DCHECK(old_context_factory);
   }
 #endif
   ui::ContextFactory* context_factory =
       ui::InitializeContextFactoryForTests(enable_pixel_output);
   views_delegate_->set_context_factory(context_factory);
 
   test_helper_.reset(ViewsTestHelper::Create(base::MessageLoopForUI::current(),
@@ skipping 27 matching lines @@
   platform_test_helper_.reset();
 
   ui::TerminateContextFactoryForTests();
 }
 
 gfx::NativeWindow ScopedViewsTestHelper::GetContext() {
   return test_helper_->GetContext();
 }
 
 }  // namespace views