Move c/c/e/extension_set to top-level extensions/

chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc

 // Copyright 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/sync_file_system/drive_backend/sync_engine.h"
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/drive/drive_uploader.h"
 #include "chrome/browser/drive/fake_drive_service.h"
 #include "chrome/browser/extensions/test_extension_service.h"
 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h"
 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h"
 #include "chrome/browser/sync_file_system/sync_file_system_test_util.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_builder.h"
+#include "extensions/common/extension_set.h"
 #include "extensions/common/value_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace sync_file_system {
 namespace drive_backend {
 
 namespace {
 
 const char kAppID[] = "app_id";
 
@@ skipping 17 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockSyncTask);
 };
 
 class MockExtensionService : public TestExtensionService {
  public:
   MockExtensionService() {}
   virtual ~MockExtensionService() {}
 
-  virtual const ExtensionSet* extensions() const OVERRIDE {
+  virtual const extensions::ExtensionSet* extensions() const OVERRIDE {
     return &extensions_;
   }
 
-  virtual const ExtensionSet* disabled_extensions() const OVERRIDE {
+  virtual const extensions::ExtensionSet* disabled_extensions() const OVERRIDE {
     return &disabled_extensions_;
   }
 
   virtual void AddExtension(const extensions::Extension* extension) OVERRIDE {
     extensions_.Insert(make_scoped_refptr(extension));
   }
 
   virtual const extensions::Extension* GetInstalledExtension(
       const std::string& extension_id) const OVERRIDE {
     return extensions_.GetByID(extension_id);
@@ skipping 11 matching lines @@
   }
 
   void DisableExtension(const std::string& extension_id) {
     if (!IsExtensionEnabled(extension_id))
       return;
     const extensions::Extension* extension = extensions_.GetByID(extension_id);
     disabled_extensions_.Insert(make_scoped_refptr(extension));
   }
 
  private:
-  ExtensionSet extensions_;
-  ExtensionSet disabled_extensions_;
+  extensions::ExtensionSet extensions_;
+  extensions::ExtensionSet disabled_extensions_;
 
   DISALLOW_COPY_AND_ASSIGN(MockExtensionService);
 };
 
 class SyncEngineTest
     : public testing::Test,
       public base::SupportsWeakPtr<SyncEngineTest> {
  public:
   SyncEngineTest() {}
   virtual ~SyncEngineTest() {}
@@ skipping 244 matching lines @@
       base::Bind(&SyncEngineTest::CheckServiceState,
                  AsWeakPtr(),
                  SYNC_STATUS_OK,
                  REMOTE_SERVICE_OK));
 
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system