Remove OnOptInChanged callback.

chrome/browser/chromeos/arc/arc_auth_service_browsertest.cc

 // 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.
 
 #include <memory>
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 37 matching lines @@
 const char kManagedAuthToken[] = "managed-auth-token";
 // Set unmanaged auth token for other Android unmanaged accounts.
 const char kUnmanagedAuthToken[] = "unmanaged-auth-token";
 const char kWellKnownConsumerName[] = "test@gmail.com";
 const char kFakeUserName[] = "test@example.com";
 
 }  // namespace
 
 namespace arc {
 
-// Base ArcAuthService observer.
-class ArcAuthServiceObserver : public ArcAuthService::Observer {
+// Observer of ARC bridge shutdown.
+class ArcAuthServiceShutdownObserver : public ArcAuthService::Observer {
  public:
-  // ArcAuthService::Observer:
-  ~ArcAuthServiceObserver() override {
+  ArcAuthServiceShutdownObserver() { ArcAuthService::Get()->AddObserver(this); }
+
+  ~ArcAuthServiceShutdownObserver() override {
     ArcAuthService::Get()->RemoveObserver(this);
   }
 
   void Wait() {
     run_loop_.reset(new base::RunLoop);
     run_loop_->Run();
     run_loop_.reset();
   }
 
- protected:
-  ArcAuthServiceObserver() { ArcAuthService::Get()->AddObserver(this); }
-
-  std::unique_ptr<base::RunLoop> run_loop_;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ArcAuthServiceObserver);
-};
-
-// Observer of ArcAuthService state change.
-class ArcAuthServiceStateObserver : public ArcAuthServiceObserver {
- public:
-  ArcAuthServiceStateObserver() : ArcAuthServiceObserver() {}
-
-  // ArcAuthService::Observer:
-  void OnOptInChanged(ArcAuthService::State state) override {
-    if (!run_loop_)
-      return;
-    run_loop_->Quit();
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ArcAuthServiceStateObserver);
-};
-
-// Observer of ARC bridge shutdown.
-class ArcAuthServiceShutdownObserver : public ArcAuthServiceObserver {
- public:
-  ArcAuthServiceShutdownObserver() : ArcAuthServiceObserver() {}
-
   // ArcAuthService::Observer:
   void OnShutdownBridge() override {
     if (!run_loop_)
       return;
     run_loop_->Quit();
   }
 
  private:
+  std::unique_ptr<base::RunLoop> run_loop_;
+
   DISALLOW_COPY_AND_ASSIGN(ArcAuthServiceShutdownObserver);
 };
 
 class ArcAuthServiceTest : public InProcessBrowserTest {
  protected:
   ArcAuthServiceTest() {}
 
   // InProcessBrowserTest:
   ~ArcAuthServiceTest() override {}
 
@@ skipping 125 matching lines @@
 
   prefs->SetBoolean(prefs::kArcEnabled, true);
   token_service()->IssueTokenForAllPendingRequests(kManagedAuthToken,
                                                    base::Time::Max());
   ArcAuthServiceShutdownObserver observer;
   observer.Wait();
   ASSERT_EQ(ArcAuthService::State::STOPPED, ArcAuthService::Get()->state());
 }
 
 }  // namespace arc