[chromeos] Move files from chromeos/power to chrome/browser/chromeos/power

This is being done so that content::BrowserThread can be used in
PowerDataCollector, which is required for future changes.

BUG=312956,335816
TBR=arv

Review URL: https://codereview.chromium.org/153153002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248852 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 13 insertions, 13 deletions

diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index c1744ff..2e11fd5 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -56,6 +56,7 @@
 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h"
 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h"
 #include "chrome/browser/chromeos/power/power_button_observer.h"
+#include "chrome/browser/chromeos/power/power_data_collector.h"
 #include "chrome/browser/chromeos/power/power_prefs.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h"
@@ -94,7 +95,6 @@
 #include "chromeos/network/network_change_notifier_chromeos.h"
 #include "chromeos/network/network_change_notifier_factory_chromeos.h"
 #include "chromeos/network/network_handler.h"
-#include "chromeos/power/power_data_collector.h"
 #include "chromeos/system/statistics_provider.h"
 #include "chromeos/tpm_token_loader.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/chromeos/power/power_data_collector.cc b/chrome/browser/chromeos/power/power_data_collector.cc
index 8d1811b..b997bb0 100644
--- a/chromeos/power/power_data_collector.cc
+++ b/chrome/browser/chromeos/power/power_data_collector.cc
@@ -1,8 +1,8 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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 "chromeos/power/power_data_collector.h"
+#include "chrome/browser/chromeos/power/power_data_collector.h"
 
 #include "base/logging.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
diff --git a/chromeos/power/power_data_collector.h b/chrome/browser/chromeos/power/power_data_collector.h
index f57a0e9..db68342 100644
--- a/chromeos/power/power_data_collector.h
+++ b/chrome/browser/chromeos/power/power_data_collector.h
@@ -1,9 +1,9 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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 CHROMEOS_POWER_POWER_DATA_COLLECTOR_H_
-#define CHROMEOS_POWER_POWER_DATA_COLLECTOR_H_
+#ifndef CHROME_BROWSER_CHROMEOS_POWER_POWER_DATA_COLLECTOR_H_
+#define CHROME_BROWSER_CHROMEOS_POWER_POWER_DATA_COLLECTOR_H_
 
 #include <deque>
 
@@ -112,4 +112,4 @@ void AddSample(std::deque<SampleType>* sample_queue, const SampleType& sample) {
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_POWER_POWER_DATA_COLLECTOR_H_
+#endif  // CHROME_BROWSER_CHROMEOS_POWER_POWER_DATA_COLLECTOR_H_
diff --git a/chromeos/power/power_data_collector_unittest.cc b/chrome/browser/chromeos/power/power_data_collector_unittest.cc
index ac38038..ed7f2d8 100644
--- a/chromeos/power/power_data_collector_unittest.cc
+++ b/chrome/browser/chromeos/power/power_data_collector_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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 "chromeos/power/power_data_collector.h"
+#include "chrome/browser/chromeos/power/power_data_collector.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager/power_supply_properties.pb.h"
diff --git a/chrome/browser/ui/webui/chromeos/power_ui.cc b/chrome/browser/ui/webui/chromeos/power_ui.cc
index 9478382..b7f35eb 100644
--- a/chrome/browser/ui/webui/chromeos/power_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/power_ui.cc
@@ -10,9 +10,9 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "base/values.h"
+#include "chrome/browser/chromeos/power/power_data_collector.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
-#include "chromeos/power/power_data_collector.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/browser/web_ui_message_handler.h"
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index 2bc9557..79b471a 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -757,6 +757,8 @@
         'browser/chromeos/power/peripheral_battery_observer.h',
         'browser/chromeos/power/power_button_observer.cc',
         'browser/chromeos/power/power_button_observer.h',
+        'browser/chromeos/power/power_data_collector.cc',
+        'browser/chromeos/power/power_data_collector.h',
         'browser/chromeos/power/power_prefs.cc',
         'browser/chromeos/power/power_prefs.h',
         'browser/chromeos/power/session_state_controller_delegate_chromeos.cc',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 025cefa..c74f865 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -745,6 +745,7 @@
         'browser/chromeos/policy/recommendation_restorer_unittest.cc',
         'browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc',
         'browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc',
+        'browser/chromeos/power/power_data_collector_unittest.cc',
         'browser/chromeos/power/power_prefs_unittest.cc',
         'browser/chromeos/preferences_unittest.cc',
         'browser/chromeos/profiles/profile_list_chromeos_unittest.cc',
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp
index 33cc695..3922ba0 100644
--- a/chromeos/chromeos.gyp
+++ b/chromeos/chromeos.gyp
@@ -320,8 +320,6 @@
         'network/shill_property_util.h',
         'network/dhcp_proxy_script_fetcher_chromeos.cc',
         'network/dhcp_proxy_script_fetcher_chromeos.h',
-        'power/power_data_collector.cc',
-        'power/power_data_collector.h',
         'process_proxy/process_output_watcher.cc',
         'process_proxy/process_output_watcher.h',
         'process_proxy/process_proxy.cc',
@@ -521,7 +519,6 @@
         'network/onc/onc_validator_unittest.cc',
         'network/shill_property_handler_unittest.cc',
         'network/shill_property_util_unittest.cc',
-        'power/power_data_collector_unittest.cc',
         'process_proxy/process_output_watcher_unittest.cc',
         'process_proxy/process_proxy_unittest.cc',
         'system/name_value_pairs_parser_unittest.cc',