chrome/browser/plugin_service_unittest.cc - Issue 5998002: Revert "Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"

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/plugin_service_unittest.cc

Issue 5998002: Revert "Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 10 years 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/plugin_service_browsertest.cc ('k') | chrome/browser/plugin_updater.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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/plugin_service.h"	5 #include "chrome/browser/plugin_service.h"

6	6

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

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

9 #include "chrome/browser/browser_thread.h"	9 #include "chrome/browser/browser_thread.h"

10 #include "chrome/test/testing_profile.h"	10 #include "chrome/test/testing_profile.h"

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

	12 #include "webkit/glue/plugins/plugin_list.h"

12	13

13 namespace {	14 namespace {

14	15

15 class PluginServiceTest : public testing::Test {	16 class PluginServiceTest : public testing::Test {

16 public:	17 public:

17 PluginServiceTest()	18 PluginServiceTest()

18 : message_loop_(MessageLoop::TYPE_IO),	19 : message_loop_(MessageLoop::TYPE_IO),

19 ui_thread_(BrowserThread::UI, &message_loop_),	20 ui_thread_(BrowserThread::UI, &message_loop_),

20 file_thread_(BrowserThread::FILE, &message_loop_),	21 file_thread_(BrowserThread::FILE, &message_loop_),

21 io_thread_(BrowserThread::IO, &message_loop_) {}	22 io_thread_(BrowserThread::IO, &message_loop_) {}

(...skipping 31 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
53 plugin_service_->SetChromePluginDataDir(plugin_data_dir);	54 plugin_service_->SetChromePluginDataDir(plugin_data_dir);

54 EXPECT_EQ(plugin_data_dir, plugin_service_->GetChromePluginDataDir());	55 EXPECT_EQ(plugin_data_dir, plugin_service_->GetChromePluginDataDir());

55 }	56 }

56	57

57 TEST_F(PluginServiceTest, GetUILocale) {	58 TEST_F(PluginServiceTest, GetUILocale) {

58 // Check for a non-empty locale string.	59 // Check for a non-empty locale string.

59 EXPECT_NE("", plugin_service_->GetUILocale());	60 EXPECT_NE("", plugin_service_->GetUILocale());

60 }	61 }

61	62

62 } // namespace	63 } // namespace

OLD	NEW