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

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

Issue 8336007: Move content_client.h into content/public. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add back a needed include. Created 9 years, 2 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/shell/shell_content_client.h ('k') | content/test/test_content_client.h » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "content/browser/mock_content_browser_client.h" 9 #include "content/browser/mock_content_browser_client.h"
10 #include "content/common/content_client.h"
11 #include "content/common/content_paths.h" 10 #include "content/common/content_paths.h"
12 #include "content/common/notification_service.h" 11 #include "content/common/notification_service.h"
12 #include "content/public/common/content_client.h"
13 #include "content/test/test_content_client.h" 13 #include "content/test/test_content_client.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 #include "ui/base/ui_base_paths.h" 15 #include "ui/base/ui_base_paths.h"
16 16
17 namespace { 17 namespace {
18 18
19 class TestContentClientInitializer : public testing::EmptyTestEventListener { 19 class TestContentClientInitializer : public testing::EmptyTestEventListener {
20 public: 20 public:
21 TestContentClientInitializer() { 21 TestContentClientInitializer() {
22 } 22 }
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 void ContentTestSuite::Initialize() { 62 void ContentTestSuite::Initialize() {
63 base::TestSuite::Initialize(); 63 base::TestSuite::Initialize();
64 64
65 content::RegisterPathProvider(); 65 content::RegisterPathProvider();
66 ui::RegisterPathProvider(); 66 ui::RegisterPathProvider();
67 67
68 testing::TestEventListeners& listeners = 68 testing::TestEventListeners& listeners =
69 testing::UnitTest::GetInstance()->listeners(); 69 testing::UnitTest::GetInstance()->listeners();
70 listeners.Append(new TestContentClientInitializer); 70 listeners.Append(new TestContentClientInitializer);
71 } 71 }
OLDNEW
« no previous file with comments | « content/shell/shell_content_client.h ('k') | content/test/test_content_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698