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

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

Issue 440423003: Clean content_settings_pattern_parser.* from unnecessary dependencies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: @vabr and @bauerb comments addressed Created 6 years, 4 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 "chrome/test/base/chrome_test_suite.h" 5 #include "chrome/test/base/chrome_test_suite.h"
6 6
7 #if defined(OS_CHROMEOS) 7 #if defined(OS_CHROMEOS)
8 #include <stdio.h> 8 #include <stdio.h>
9 #include <unistd.h> 9 #include <unistd.h>
10 #endif 10 #endif
11 11
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/path_service.h" 14 #include "base/path_service.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "chrome/browser/browser_process.h" 16 #include "chrome/browser/browser_process.h"
17 #include "chrome/common/chrome_constants.h" 17 #include "chrome/common/chrome_constants.h"
18 #include "chrome/common/chrome_paths.h" 18 #include "chrome/common/chrome_paths.h"
19 #include "chrome/common/content_settings_component.h"
19 #include "chrome/common/url_constants.h" 20 #include "chrome/common/url_constants.h"
20 #include "content/public/test/test_launcher.h" 21 #include "content/public/test/test_launcher.h"
21 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
22 23
23 #if defined(OS_ANDROID) 24 #if defined(OS_ANDROID)
24 #include "base/android/jni_android.h" 25 #include "base/android/jni_android.h"
25 #include "chrome/browser/android/chrome_jni_registrar.h" 26 #include "chrome/browser/android/chrome_jni_registrar.h"
26 #include "net/android/net_jni_registrar.h" 27 #include "net/android/net_jni_registrar.h"
27 #include "ui/base/android/ui_base_jni_registrar.h" 28 #include "ui/base/android/ui_base_jni_registrar.h"
28 #include "ui/gfx/android/gfx_jni_registrar.h" 29 #include "ui/gfx/android/gfx_jni_registrar.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 // ChromeOS. That means we are autotest and, if ASAN is used, 100 // ChromeOS. That means we are autotest and, if ASAN is used,
100 // external libraries load crashes. 101 // external libraries load crashes.
101 if (!IsCrosPythonProcess()) 102 if (!IsCrosPythonProcess())
102 media::InitializeMediaLibraryForTesting(); 103 media::InitializeMediaLibraryForTesting();
103 #endif 104 #endif
104 105
105 // Initialize after overriding paths as some content paths depend on correct 106 // Initialize after overriding paths as some content paths depend on correct
106 // values for DIR_EXE and DIR_MODULE. 107 // values for DIR_EXE and DIR_MODULE.
107 content::ContentTestSuiteBase::Initialize(); 108 content::ContentTestSuiteBase::Initialize();
108 109
110 InitContentSettingsComponent();
111
109 #if defined(OS_MACOSX) && !defined(OS_IOS) 112 #if defined(OS_MACOSX) && !defined(OS_IOS)
110 // Look in the framework bundle for resources. 113 // Look in the framework bundle for resources.
111 base::FilePath path; 114 base::FilePath path;
112 PathService::Get(base::DIR_EXE, &path); 115 PathService::Get(base::DIR_EXE, &path);
113 path = path.Append(chrome::kFrameworkName); 116 path = path.Append(chrome::kFrameworkName);
114 base::mac::SetOverrideFrameworkBundlePath(path); 117 base::mac::SetOverrideFrameworkBundlePath(path);
115 #endif 118 #endif
116 } 119 }
117 120
118 void ChromeTestSuite::Shutdown() { 121 void ChromeTestSuite::Shutdown() {
119 #if defined(OS_MACOSX) && !defined(OS_IOS) 122 #if defined(OS_MACOSX) && !defined(OS_IOS)
120 base::mac::SetOverrideFrameworkBundle(NULL); 123 base::mac::SetOverrideFrameworkBundle(NULL);
121 #endif 124 #endif
122 125
123 content::ContentTestSuiteBase::Shutdown(); 126 content::ContentTestSuiteBase::Shutdown();
124 } 127 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698