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

Side by Side Diff: content/test/content_test_suite.cc

Issue 10386020: Revert r135533. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . 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 | « content/test/content_test_suite.h ('k') | ui/aura/aura.gyp » ('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 "content/test/content_test_suite.h" 5 #include "content/test/content_test_suite.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/browser/mock_content_browser_client.h" 8 #include "content/browser/mock_content_browser_client.h"
9 #include "content/public/common/content_paths.h" 9 #include "content/public/common/content_paths.h"
10 #include "content/public/common/url_constants.h" 10 #include "content/public/common/url_constants.h"
11 #include "content/test/test_content_client.h" 11 #include "content/test/test_content_client.h"
12 #include "content/test/test_content_client_initializer.h" 12 #include "content/test/test_content_client_initializer.h"
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 #include "ui/base/resource/resource_bundle.h"
15 #include "ui/base/ui_base_paths.h" 14 #include "ui/base/ui_base_paths.h"
16 15
17 #if defined(OS_MACOSX) 16 #if defined(OS_MACOSX)
18 #include "base/mac/scoped_nsautorelease_pool.h" 17 #include "base/mac/scoped_nsautorelease_pool.h"
19 #endif 18 #endif
20 #include "ui/compositor/compositor_setup.h" 19 #include "ui/compositor/compositor_setup.h"
21 20
22 21
23 namespace { 22 namespace {
24 23
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 64
66 content::RegisterPathProvider(); 65 content::RegisterPathProvider();
67 ui::RegisterPathProvider(); 66 ui::RegisterPathProvider();
68 67
69 // Mock out the compositor on platforms that use it. 68 // Mock out the compositor on platforms that use it.
70 ui::SetupTestCompositor(); 69 ui::SetupTestCompositor();
71 70
72 testing::TestEventListeners& listeners = 71 testing::TestEventListeners& listeners =
73 testing::UnitTest::GetInstance()->listeners(); 72 testing::UnitTest::GetInstance()->listeners();
74 listeners.Append(new TestInitializationListener); 73 listeners.Append(new TestInitializationListener);
75 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US");
76 } 74 }
77 75
78 void ContentTestSuite::Shutdown() {
79 ui::ResourceBundle::CleanupSharedInstance();
80 base::TestSuite::Shutdown();
81 }
OLDNEW
« no previous file with comments | « content/test/content_test_suite.h ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698