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

Side by Side Diff: components/test/run_all_unittests.cc

Issue 1684153002: Web restrictions component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build problems and missing file Created 4 years, 10 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
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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/metrics/statistics_recorder.h" 10 #include "base/metrics/statistics_recorder.h"
(...skipping 11 matching lines...) Expand all
22 #include "content/public/test/test_content_client_initializer.h" 22 #include "content/public/test/test_content_client_initializer.h"
23 #include "ui/gl/test/gl_surface_test_support.h" 23 #include "ui/gl/test/gl_surface_test_support.h"
24 #endif 24 #endif
25 25
26 #if defined(OS_ANDROID) 26 #if defined(OS_ANDROID)
27 #include "base/android/jni_android.h" 27 #include "base/android/jni_android.h"
28 #include "components/invalidation/impl/android/component_jni_registrar.h" 28 #include "components/invalidation/impl/android/component_jni_registrar.h"
29 #include "components/policy/core/browser/android/component_jni_registrar.h" 29 #include "components/policy/core/browser/android/component_jni_registrar.h"
30 #include "components/safe_json/android/component_jni_registrar.h" 30 #include "components/safe_json/android/component_jni_registrar.h"
31 #include "components/signin/core/browser/android/component_jni_registrar.h" 31 #include "components/signin/core/browser/android/component_jni_registrar.h"
32 #include "components/web_restrictions/browser/mock_web_restrictions_client.h"
32 #include "content/public/test/test_utils.h" 33 #include "content/public/test/test_utils.h"
33 #include "net/android/net_jni_registrar.h" 34 #include "net/android/net_jni_registrar.h"
34 #include "ui/base/android/ui_base_jni_registrar.h" 35 #include "ui/base/android/ui_base_jni_registrar.h"
35 #include "ui/gfx/android/gfx_jni_registrar.h" 36 #include "ui/gfx/android/gfx_jni_registrar.h"
36 #endif 37 #endif
37 38
38 #if defined(OS_CHROMEOS) 39 #if defined(OS_CHROMEOS)
39 #include "mojo/edk/embedder/embedder.h" 40 #include "mojo/edk/embedder/embedder.h"
40 #endif 41 #endif
41 42
(...skipping 11 matching lines...) Expand all
53 // are correctly registered with the statistics recorder and can be queried 54 // are correctly registered with the statistics recorder and can be queried
54 // by tests. 55 // by tests.
55 base::StatisticsRecorder::Initialize(); 56 base::StatisticsRecorder::Initialize();
56 57
57 #if !defined(OS_IOS) 58 #if !defined(OS_IOS)
58 gfx::GLSurfaceTestSupport::InitializeOneOff(); 59 gfx::GLSurfaceTestSupport::InitializeOneOff();
59 #endif 60 #endif
60 #if defined(OS_ANDROID) 61 #if defined(OS_ANDROID)
61 // Register JNI bindings for android. 62 // Register JNI bindings for android.
62 JNIEnv* env = base::android::AttachCurrentThread(); 63 JNIEnv* env = base::android::AttachCurrentThread();
64 ASSERT_TRUE(content::RegisterJniForTesting(env));
63 ASSERT_TRUE(gfx::android::RegisterJni(env)); 65 ASSERT_TRUE(gfx::android::RegisterJni(env));
64 ASSERT_TRUE(ui::android::RegisterJni(env));
65 ASSERT_TRUE(invalidation::android::RegisterInvalidationJni(env)); 66 ASSERT_TRUE(invalidation::android::RegisterInvalidationJni(env));
66 ASSERT_TRUE(policy::android::RegisterPolicy(env)); 67 ASSERT_TRUE(policy::android::RegisterPolicy(env));
67 ASSERT_TRUE(safe_json::android::RegisterSafeJsonJni(env)); 68 ASSERT_TRUE(safe_json::android::RegisterSafeJsonJni(env));
68 ASSERT_TRUE(signin::android::RegisterSigninJni(env)); 69 ASSERT_TRUE(signin::android::RegisterSigninJni(env));
69 ASSERT_TRUE(net::android::RegisterJni(env)); 70 ASSERT_TRUE(net::android::RegisterJni(env));
70 ASSERT_TRUE(content::RegisterJniForTesting(env)); 71 ASSERT_TRUE(ui::android::RegisterJni(env));
72 ASSERT_TRUE(web_restrictions::MockWebRestrictionsClient::Register(env));
71 #endif 73 #endif
72 74
73 ui::RegisterPathProvider(); 75 ui::RegisterPathProvider();
74 76
75 base::FilePath pak_path; 77 base::FilePath pak_path;
76 #if defined(OS_ANDROID) 78 #if defined(OS_ANDROID)
77 PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &pak_path); 79 PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &pak_path);
78 #else 80 #else
79 PathService::Get(base::DIR_MODULE, &pak_path); 81 PathService::Get(base::DIR_MODULE, &pak_path);
80 #endif 82 #endif
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 listeners.Append(new ComponentsUnitTestEventListener()); 147 listeners.Append(new ComponentsUnitTestEventListener());
146 148
147 #if defined(OS_CHROMEOS) 149 #if defined(OS_CHROMEOS)
148 mojo::edk::Init(); 150 mojo::edk::Init();
149 #endif 151 #endif
150 152
151 return base::LaunchUnitTests( 153 return base::LaunchUnitTests(
152 argc, argv, base::Bind(&base::TestSuite::Run, 154 argc, argv, base::Bind(&base::TestSuite::Run,
153 base::Unretained(&test_suite))); 155 base::Unretained(&test_suite)));
154 } 156 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698