Move most of the component updater artifacts to update_client.

components/update_client/component_unpacker.h

 // 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.
 
-#ifndef COMPONENTS_COMPONENT_UPDATER_COMPONENT_UNPACKER_H_
-#define COMPONENTS_COMPONENT_UPDATER_COMPONENT_UNPACKER_H_
+#ifndef COMPONENTS_UPDATE_CLIENT_COMPONENT_UNPACKER_H_
+#define COMPONENTS_UPDATE_CLIENT_COMPONENT_UNPACKER_H_
 
 #include <stdint.h>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/sequenced_task_runner.h"
 
-namespace component_updater {
+namespace update_client {
 
 class ComponentInstaller;
 class ComponentPatcher;
 class OutOfProcessPatcher;
 
 // Deserializes the CRX manifest. The top level must be a dictionary.
 scoped_ptr<base::DictionaryValue> ReadManifest(
     const base::FilePath& unpack_path);
 
 // In charge of unpacking the component CRX package and verifying that it is
@@ skipping 61 matching lines @@
 
   typedef base::Callback<void(Error, int)> Callback;
 
   // Constructs an unpacker for a specific component unpacking operation.
   // |pk_hash| is the expected/ public key SHA256 hash. |path| is the current
   // location of the CRX.
   ComponentUnpacker(const std::vector<uint8_t>& pk_hash,
                     const base::FilePath& path,
                     const std::string& fingerprint,
                     ComponentInstaller* installer,
-                    scoped_refptr<OutOfProcessPatcher> out_of_process_patcher,
+                    scoped_refptr<OutOfProcessPatcher> oop_patcher,
                     scoped_refptr<base::SequencedTaskRunner> task_runner);
 
   // Begins the actual unpacking of the files. May invoke a patcher if the
   // package is a differential update. Calls |callback| with the result.
   void Unpack(const Callback& callback);
 
  private:
   friend class base::RefCountedThreadSafe<ComponentUnpacker>;
 
   virtual ~ComponentUnpacker();
@@ skipping 29 matching lines @@
 
   std::vector<uint8_t> pk_hash_;
   base::FilePath path_;
   base::FilePath unpack_path_;
   base::FilePath unpack_diff_path_;
   bool is_delta_;
   std::string fingerprint_;
   scoped_refptr<ComponentPatcher> patcher_;
   ComponentInstaller* installer_;
   Callback callback_;
-  scoped_refptr<OutOfProcessPatcher> out_of_process_patcher_;
+  scoped_refptr<OutOfProcessPatcher> oop_patcher_;
   Error error_;
   int extended_error_;
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(ComponentUnpacker);
 };
 
-}  // namespace component_updater
+}  // namespace update_client
 
-#endif  // COMPONENTS_COMPONENT_UPDATER_COMPONENT_UNPACKER_H_
+#endif  // COMPONENTS_UPDATE_CLIENT_COMPONENT_UNPACKER_H_