[Sync] //components/sync internal changes [DO NOT SUBMIT]

components/sync/core_impl/attachments/attachment_service_impl_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 "sync/internal_api/public/attachments/attachment_service_impl.h"
+#include "components/sync/core/attachments/attachment_service_impl.h"
 
 #include <algorithm>
 #include <map>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/timer/mock_timer.h"
-#include "sync/api/attachments/attachment_store_backend.h"
-#include "sync/internal_api/public/attachments/attachment_util.h"
-#include "sync/internal_api/public/attachments/fake_attachment_downloader.h"
-#include "sync/internal_api/public/attachments/fake_attachment_uploader.h"
+#include "components/sync/api/attachments/attachment_store_backend.h"
+#include "components/sync/core/attachments/attachment_util.h"
+#include "components/sync/core/attachments/fake_attachment_downloader.h"
+#include "components/sync/core/attachments/fake_attachment_uploader.h"
 #include "testing/gmock/include/gmock/gmock-matchers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 
 namespace {
 
 class MockAttachmentStoreBackend
     : public AttachmentStoreBackend,
       public base::SupportsWeakPtr<MockAttachmentStoreBackend> {
@@ skipping 244 matching lines @@
   }
 
   static AttachmentIdSet AttachmentIdSetFromList(
       const AttachmentIdList& id_list) {
     AttachmentIdSet id_set;
     std::copy(id_list.begin(), id_list.end(),
               std::inserter(id_set, id_set.end()));
     return id_set;
   }
 
-  const std::vector<AttachmentService::GetOrDownloadResult>&
-  download_results() const {
+  const std::vector<AttachmentService::GetOrDownloadResult>& download_results()
+      const {
     return download_results_;
   }
 
   const AttachmentMap& last_download_attachments() const {
     return *last_download_attachments_.get();
   }
 
   net::NetworkChangeNotifier* network_change_notifier() {
     return network_change_notifier_.get();
   }
 
   MockAttachmentStoreBackend* store() {
     return attachment_store_backend_.get();
   }
 
   MockAttachmentDownloader* downloader() {
     return attachment_downloader_.get();
   }
 
-  MockAttachmentUploader* uploader() {
-    return attachment_uploader_.get();
-  }
+  MockAttachmentUploader* uploader() { return attachment_uploader_.get(); }
 
   const std::vector<AttachmentId>& on_attachment_uploaded_list() const {
     return on_attachment_uploaded_list_;
   }
 
  private:
   base::MessageLoop message_loop_;
   std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier_;
   base::WeakPtr<MockAttachmentStoreBackend> attachment_store_backend_;
   base::WeakPtr<MockAttachmentDownloader> attachment_downloader_;
@@ skipping 307 matching lines @@
   net::NetworkChangeNotifier::NotifyObserversOfNetworkChangeForTests(
       net::NetworkChangeNotifier::CONNECTION_WIFI);
   RunLoop();
 
   // No longer in backoff.
   ASSERT_TRUE(mock_timer()->IsRunning());
   ASSERT_EQ(base::TimeDelta(), mock_timer()->GetCurrentDelay());
 }
 
 }  // namespace syncer