[Cleanup] Used scoped pointers in KeyedServiceFactory's SetTestingFactory functions.

components/feedback/feedback_data_unittest.cc

 // Copyright 2014 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 "components/feedback/feedback_data.h"
 
 #include <set>
 
+#include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
 #include "components/feedback/feedback_uploader.h"
 #include "components/feedback/feedback_uploader_factory.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/user_prefs/user_prefs.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 12 matching lines @@
 
 class MockUploader : public feedback::FeedbackUploader, public KeyedService {
  public:
   MockUploader(content::BrowserContext* context)
       : FeedbackUploader(context ? context->GetPath() : base::FilePath(),
                          BrowserThread::GetBlockingPool()) {}
 
   MOCK_METHOD1(DispatchReport, void(const std::string&));
 };
 
-MockUploader *g_uploader;
-
-KeyedService* CreateFeedbackUploaderService(content::BrowserContext* context) {
-  if (!g_uploader)
-    g_uploader = new MockUploader(context);
-  EXPECT_CALL(*g_uploader, DispatchReport(testing::_)).Times(1);
-  return g_uploader;
+scoped_ptr<KeyedService> CreateFeedbackUploaderService(
+    content::BrowserContext* context) {
+  scoped_ptr<MockUploader> uploader(new MockUploader(context));
+  EXPECT_CALL(*uploader, DispatchReport(testing::_)).Times(1);
+  return uploader.Pass();
 }
 
 scoped_ptr<std::string> MakeScoped(const char* str) {
   return scoped_ptr<std::string>(new std::string(str));
 }
 
 }  // namespace
 
 namespace feedback {
 
@@ skipping 43 matching lines @@
   content::TestBrowserThread ui_thread_;
 };
 
 TEST_F(FeedbackDataTest, ReportSending) {
   data_->SetAndCompressHistograms(MakeScoped(kHistograms).Pass());
   data_->set_image(MakeScoped(kImageData).Pass());
   data_->AttachAndCompressFileData(MakeScoped(kFileData).Pass());
   Send();
   RunMessageLoop();
   EXPECT_TRUE(data_->IsDataComplete());
-  delete g_uploader;
-  g_uploader = NULL;
 }
 
 }  // namespace feedback