Migrate ArcUserDataService into ArcAuthService.

chrome/browser/chromeos/arc/arc_auth_service.h

 // Copyright 2016 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_ARC_ARC_AUTH_SERVICE_H_
 #define CHROME_BROWSER_CHROMEOS_ARC_ARC_AUTH_SERVICE_H_
 
 #include <memory>
 #include <ostream>
 #include <string>
@@ skipping 163 matching lines @@
   void OnContextReady() override;
   void OnPrepareContextFailed() override;
 
   // ArcAndroidManagementCheckerDelegate:
   void OnAndroidManagementChecked(
       policy::AndroidManagementClient::Result result) override;
 
   // Stops ARC without changing ArcEnabled preference.
   void StopArc();
 
+  // If arc is running, StopArc(), then StartArc(). Between them
+  // data clear may happens.
+  void ReenableArc();

[Luis Héctor Chávez, 2016/08/09 16:40:02]

How about calling this "RestartArc()"? Also, the documentation seems a bit
inaccurate, since you assert if ARC is not running. How about "Calls StopArc()
followed by StartArc(). When ARC is stopped, data wiping will occur if it was
scheduled. This must be called only when ARC is running".

[hidehiko, 2016/08/10 05:41:19]

Can we keep the name? The comment was wrong and fixed in the latest PS. Sorry
for confusion.

+
+  // Removes the data if ARC is stopped. Otherwise, queue to remove the data
+  // on ARC is stopped.
+  void RemoveArcData();

[Luis Héctor Chávez, 2016/08/09 16:40:02]

How about to make this less confusing, call this "ScheduleArcDataWipe()", and
require it to be called when ARC is running. IIUC you only call it while ARC is
stopped just in one place.

[hidehiko, 2016/08/10 05:41:19]

This does not actually "schedule" but remove the data. If ARC is running, it is
just postponed, I think. And actually it can be called while ARC is stopped.
WDYT?

+  void OnArcDataRemoved(bool success);

[khmel, 2016/08/09 15:23:11]

it seems, it can be private

[hidehiko, 2016/08/10 05:41:19]

Done.

+
   // Returns current page that has to be shown in OptIn UI.
   UIPage ui_page() const { return ui_page_; }
 
   // Returns current page status, relevant to the specific page.
   const base::string16& ui_page_status() { return ui_page_status_; }
 
  private:
   void StartArc();
   void ShowUI(UIPage page, const base::string16& status);
   void CloseUI();
@@ skipping 18 matching lines @@
   State state_ = State::NOT_INITIALIZED;
   base::ObserverList<Observer> observer_list_;
   std::unique_ptr<ArcAppLauncher> playstore_launcher_;
   std::string auth_code_;
   GetAuthCodeCallback auth_callback_;
   bool initial_opt_in_ = false;
   bool disable_arc_from_ui_ = false;
   UIPage ui_page_ = UIPage::NO_PAGE;
   base::string16 ui_page_status_;
   bool clear_required_ = false;
+  bool reenable_arc_ = false;
   bool waiting_for_reply_ = false;
 
   std::unique_ptr<ArcAuthContext> context_;
   std::unique_ptr<ArcAndroidManagementChecker> android_management_checker_;
 
   base::Time sign_in_time_;
 
   base::WeakPtrFactory<ArcAuthService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcAuthService);
 };
 
 std::ostream& operator<<(std::ostream& os, const ArcAuthService::State& state);
 
 }  // namespace arc
 
 #endif  // CHROME_BROWSER_CHROMEOS_ARC_ARC_AUTH_SERVICE_H_