chrome/browser/plugins/plugin_prefs_unittest.cc - Issue 16387014: Use a direct include of utf_string_conversions.h in chrome/browser/, part 3.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/plugins/plugin_prefs_unittest.cc

Issue 16387014: Use a direct include of utf_string_conversions.h in chrome/browser/, part 3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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 | « chrome/browser/plugins/plugin_prefs.cc ('k') | chrome/browser/policy/browser_policy_connector.cc » ('j') | no next file with comments »

OLD	NEW
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/browser/plugins/plugin_prefs.h"	5 #include "chrome/browser/plugins/plugin_prefs.h"

6	6

7 #include "base/at_exit.h"	7 #include "base/at_exit.h"

8 #include "base/bind.h"	8 #include "base/bind.h"

9 #include "base/message_loop.h"	9 #include "base/message_loop.h"

10 #include "base/path_service.h"	10 #include "base/path_service.h"

11 #include "base/run_loop.h"	11 #include "base/run_loop.h"

12 #include "base/utf_string_conversions.h"	12 #include "base/strings/utf_string_conversions.h"

13 #include "chrome/common/chrome_constants.h"	13 #include "chrome/common/chrome_constants.h"

14 #include "chrome/common/chrome_paths.h"	14 #include "chrome/common/chrome_paths.h"

15 #include "content/public/browser/plugin_service.h"	15 #include "content/public/browser/plugin_service.h"

16 #include "content/public/test/test_browser_thread.h"	16 #include "content/public/test/test_browser_thread.h"

17 #include "testing/gtest/include/gtest/gtest.h"	17 #include "testing/gtest/include/gtest/gtest.h"

18 #include "webkit/plugins/npapi/mock_plugin_list.h"	18 #include "webkit/plugins/npapi/mock_plugin_list.h"

19 #include "webkit/plugins/webplugininfo.h"	19 #include "webkit/plugins/webplugininfo.h"

20	20

21 using content::BrowserThread;	21 using content::BrowserThread;

22 using content::PluginService;	22 using content::PluginService;

(...skipping 224 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
247 EXPECT_FALSE(plugin_prefs_->IsPluginEnabled(bundled_plugin));	247 EXPECT_FALSE(plugin_prefs_->IsPluginEnabled(bundled_plugin));

248	248

249 EnablePluginSynchronously(true, bundled_plugin.path, true);	249 EnablePluginSynchronously(true, bundled_plugin.path, true);

250 EXPECT_FALSE(plugin_prefs_->IsPluginEnabled(component_updated_plugin_1));	250 EXPECT_FALSE(plugin_prefs_->IsPluginEnabled(component_updated_plugin_1));

251 EXPECT_FALSE(plugin_prefs_->IsPluginEnabled(component_updated_plugin_2));	251 EXPECT_FALSE(plugin_prefs_->IsPluginEnabled(component_updated_plugin_2));

252 EXPECT_TRUE(plugin_prefs_->IsPluginEnabled(bundled_plugin));	252 EXPECT_TRUE(plugin_prefs_->IsPluginEnabled(bundled_plugin));

253	253

254 plugin_prefs_->SetPluginListForTesting(NULL);	254 plugin_prefs_->SetPluginListForTesting(NULL);

255 PluginService::GetInstance()->SetPluginListForTesting(NULL);	255 PluginService::GetInstance()->SetPluginListForTesting(NULL);

256 }	256 }

OLD	NEW