Move more files to content_unittests.

content/browser/plugin_service_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/plugin_service.h"
 
 #include "content/browser/browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 class PluginServiceTest : public testing::Test {
  public:
   PluginServiceTest()
       : message_loop_(MessageLoop::TYPE_IO),
         ui_thread_(BrowserThread::UI, &message_loop_),
         file_thread_(BrowserThread::FILE, &message_loop_),
         io_thread_(BrowserThread::IO, &message_loop_) {}
 
-
-  virtual void SetUp() {
-    plugin_service_ = PluginService::GetInstance();
-    ASSERT_TRUE(plugin_service_);
-  }
-
- protected:
+ private:
   MessageLoop message_loop_;
-  PluginService* plugin_service_;
-
- private:
   BrowserThread ui_thread_;
   BrowserThread file_thread_;
   BrowserThread io_thread_;
-
-  DISALLOW_COPY_AND_ASSIGN(PluginServiceTest);
 };
 
-TEST_F(PluginServiceTest, GetUILocale) {
-  // Check for a non-empty locale string.
-  EXPECT_NE("", plugin_service_->GetUILocale());
+TEST_F(PluginServiceTest, GetInstance) {
+  ASSERT_TRUE(PluginService::GetInstance());

[jam, 2011/08/29 22:06:56]

(not related to your change)

this test seems so useless! should we just take it out?
i'm not a fan of tests that exist whose sole purpose is to ensure that
instantiating an object doesn't crash

[Paweł Hajdan Jr., 2011/08/29 22:12:14]

Done.

 }
 
 }  // namespace