Refactor OAuth2TokenService to have profile- and device-based implementations.

chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h

Index: chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h
diff --git a/chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h b/chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h
new file mode 100644
index 0000000000000000000000000000000000000000..a18bd8280ccec84fe7e9b003a68dfc03747e233f
--- /dev/null
+++ b/chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h
@@ -0,0 +1,38 @@
+// 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.
+
+#ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_OAUTH2_TOKEN_SERVICE_FACTORY_H_
+#define CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_OAUTH2_TOKEN_SERVICE_FACTORY_H_
+
+#include "base/basictypes.h"
+#include "base/memory/scoped_ptr.h"
+#include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
+
+namespace base {
+template <typename T> struct DefaultLazyInstanceTraits;
+}
+
+namespace chromeos {
+
+class DeviceOAuth2TokenServiceFactory {
+ public:
+  // Returns the instance of the DeviceOAuth2TokenService singleton.
+  static DeviceOAuth2TokenService* Get();
+
+ private:
+  DeviceOAuth2TokenServiceFactory();
+  virtual ~DeviceOAuth2TokenServiceFactory();
+  friend struct base::DefaultLazyInstanceTraits<

[Andrew T Wilson (Slow), 2013/03/19 19:58:44]

This is fine, but consider moving it to the top of the private: section which
seems more common.

[David Roche, 2013/03/21 00:12:02]

Done.

+      chromeos::DeviceOAuth2TokenServiceFactory>;
+
+  DeviceOAuth2TokenService* GetImpl();
+
+  scoped_ptr<DeviceOAuth2TokenService> device_oauth2_token_service_;
+
+  DISALLOW_COPY_AND_ASSIGN(DeviceOAuth2TokenServiceFactory);
+};
+
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_OAUTH2_TOKEN_SERVICE_FACTORY_H_