Narrow the ownership of DriveUploader from DriveSystemService to DriveScheduler.

chrome/browser/chromeos/drive/search_metadata_unittest.cc

 // Copyright (c) 2013 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 "chrome/browser/chromeos/drive/search_metadata.h"
 
 #include "base/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/drive/drive_cache.h"
@@ skipping 45 matching lines @@
     drive_webapps_registry_.reset(new DriveWebAppsRegistry);
 
     resource_metadata_.reset(new DriveResourceMetadata(
         fake_drive_service_->GetRootResourceId(),
         drive_cache_->GetCacheDirectoryPath(DriveCache::CACHE_TYPE_META),
         blocking_task_runner_));
 
     file_system_.reset(new DriveFileSystem(profile_.get(),
                                            drive_cache_.get(),
                                            fake_drive_service_.get(),
-                                           NULL,  // uploader
                                            drive_webapps_registry_.get(),
                                            resource_metadata_.get(),
                                            blocking_task_runner_));
     file_system_->Initialize();
 
     DriveFileError error = DRIVE_FILE_ERROR_FAILED;
     resource_metadata_->Initialize(
         google_apis::test_util::CreateCopyResultCallback(&error));
     google_apis::test_util::RunBlockingPoolTask();
     ASSERT_EQ(DRIVE_FILE_OK, error);
@@ skipping 238 matching lines @@
   EXPECT_EQ("&lt;<b>hello</b>&gt;", highlighted_text);
 }
 
 TEST(SearchMetadataSimpleTest, FindAndHighlight_MoreMetaChars) {
   std::string highlighted_text;
   EXPECT_TRUE(FindAndHighlight("a&b&c&d", "b&c", &highlighted_text));
   EXPECT_EQ("a&amp;<b>b&amp;c</b>&amp;d", highlighted_text);
 }
 
 }   // namespace drive