Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(118)

Side by Side Diff: chrome/test/base/in_process_browser_test.cc

Issue 10365007: ui: Move compositor/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix DEPS Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/test/base/chrome_test_suite.cc ('k') | chrome/test/base/view_event_test_base.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/test/base/in_process_browser_test.h" 5 #include "chrome/test/base/in_process_browser_test.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/stack_trace.h" 10 #include "base/debug/stack_trace.h"
(...skipping 21 matching lines...) Expand all
32 #include "chrome/test/base/testing_browser_process.h" 32 #include "chrome/test/base/testing_browser_process.h"
33 #include "chrome/test/base/ui_test_utils.h" 33 #include "chrome/test/base/ui_test_utils.h"
34 #include "content/public/browser/notification_service.h" 34 #include "content/public/browser/notification_service.h"
35 #include "content/public/browser/notification_types.h" 35 #include "content/public/browser/notification_types.h"
36 #include "content/public/browser/render_process_host.h" 36 #include "content/public/browser/render_process_host.h"
37 #include "content/renderer/mock_content_renderer_client.h" 37 #include "content/renderer/mock_content_renderer_client.h"
38 #include "content/test/test_browser_thread.h" 38 #include "content/test/test_browser_thread.h"
39 #include "content/test/test_launcher.h" 39 #include "content/test/test_launcher.h"
40 #include "net/base/mock_host_resolver.h" 40 #include "net/base/mock_host_resolver.h"
41 #include "net/test/test_server.h" 41 #include "net/test/test_server.h"
42 #include "ui/gfx/compositor/compositor_switches.h" 42 #include "ui/compositor/compositor_switches.h"
43 43
44 #if defined(OS_CHROMEOS) 44 #if defined(OS_CHROMEOS)
45 #include "chrome/browser/chromeos/audio/audio_handler.h" 45 #include "chrome/browser/chromeos/audio/audio_handler.h"
46 #elif defined(OS_MACOSX) 46 #elif defined(OS_MACOSX)
47 #include "base/mac/scoped_nsautorelease_pool.h" 47 #include "base/mac/scoped_nsautorelease_pool.h"
48 #endif 48 #endif
49 49
50 namespace { 50 namespace {
51 51
52 // Passed as value of kTestType. 52 // Passed as value of kTestType.
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 // shut down properly. 384 // shut down properly.
385 MessageLoopForUI::current()->PostTask(FROM_HERE, 385 MessageLoopForUI::current()->PostTask(FROM_HERE,
386 base::Bind(&BrowserList::AttemptExit)); 386 base::Bind(&BrowserList::AttemptExit));
387 ui_test_utils::RunMessageLoop(); 387 ui_test_utils::RunMessageLoop();
388 388
389 #if defined(OS_MACOSX) 389 #if defined(OS_MACOSX)
390 delete autorelease_pool_; 390 delete autorelease_pool_;
391 autorelease_pool_ = NULL; 391 autorelease_pool_ = NULL;
392 #endif 392 #endif
393 } 393 }
OLDNEW
« no previous file with comments | « chrome/test/base/chrome_test_suite.cc ('k') | chrome/test/base/view_event_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698