Revert of Move content/browser/power_save_blocker to //device/power_save_blocker

components/drive/DEPS

 include_rules = [
   "+components/invalidation",
   "+components/keyed_service",
   "+components/prefs",
-  "+device/power_save_blocker",
   "+google_apis",
   "+google/cacheinvalidation/types.pb.h",
   "+net",
   "+third_party/leveldatabase",
   "+third_party/re2",
 ]
 
 specific_include_rules = {
+  # The following dependency should be removed to fully make this
+  # directory chrome/ and content/ and storage/ independent.
+  # crbug.com/257943
+  "drive_uploader\.cc": [
+    "+content/public/browser/power_save_blocker_factory.h",
+  ],
+
   # The following test dependencies should be removed to fully componentize this
   # directory. crbug.com/498951
   r"(copy_operation_unittest\.cc"
   r"|create_directory_operation_unittest\.cc"
   r"|create_file_operation_unittest\.cc"
   r"|download_operation_unittest\.cc"
   r"|drive_test_util\.h"
   r"|entry_revert_performer_unittest\.cc"
   r"|entry_update_performer_unittest\.cc"
   r"|get_file_for_saving_operation_unittest\.cc"
@@ skipping 25 matching lines @@
   r"|resource_metadata_storage_unittest\.cc"
   r"|resource_metadata_unittest\.cc"
   r"|search_metadata_unittest\.cc"
   r"|sync_client_unittest\.cc"
   r")": [
     "+content/public/test/test_browser_thread_bundle.h",
   ],
 
   # The following test dependencies should be removed to fully componentize this
   # directory. crbug.com/498951
-  r"(drive_uploader\.cc"
-  r"|fake_file_system\.cc"
-  r"|file_system_unittest\.cc"
+  r"(fake_file_system\.cc"
+  r"|file_system_unittest.cc"
   r"|file_write_watcher_unittest\.cc"
   r"|get_file_for_saving_operation_unittest\.cc"
   r"|operation_test_base\.cc"
   r")": [
     "+content/public/browser/browser_thread.h",
   ],
 
   # The dependency below is ok and can stay here for the long-term, because it
   # is guarded by #if defined(OS_CHROMEOS) in the source code.
   "file_cache\.h": [
     "+third_party/cros_system_api/constants/cryptohome.h",
   ],
 }