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

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

Issue 10383298: Move RegisterContentSchemes from public url_constants into non-public url_schemes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: take RegisterContentSchemes out of public 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
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/common/url_schemes.h"
9 #include "content/public/common/content_paths.h" 10 #include "content/public/common/content_paths.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/ui_base_paths.h" 14 #include "ui/base/ui_base_paths.h"
15 15
16 #if defined(USE_AURA) 16 #if defined(USE_AURA)
17 #include "ui/aura/test/test_aura_initializer.h" 17 #include "ui/aura/test/test_aura_initializer.h"
18 #endif 18 #endif
19 19
20 #if defined(OS_MACOSX) 20 #if defined(OS_MACOSX)
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 ui::RegisterPathProvider(); 73 ui::RegisterPathProvider();
74 74
75 // Mock out the compositor on platforms that use it. 75 // Mock out the compositor on platforms that use it.
76 ui::SetupTestCompositor(); 76 ui::SetupTestCompositor();
77 77
78 testing::TestEventListeners& listeners = 78 testing::TestEventListeners& listeners =
79 testing::UnitTest::GetInstance()->listeners(); 79 testing::UnitTest::GetInstance()->listeners();
80 listeners.Append(new TestInitializationListener); 80 listeners.Append(new TestInitializationListener);
81 } 81 }
82 82
OLDNEW
« content/public/common/url_constants.h ('K') | « content/renderer/render_view_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698