Revert of Update AuraInit to handle failed initialization

ui/views/mus/aura_init.h

 // Copyright 2015 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 UI_VIEWS_MUS_AURA_INIT_H_
 #define UI_VIEWS_MUS_AURA_INIT_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 33 matching lines @@
     AURA_MUS,
 
     // Indicates AuraInit should target using aura with mus, for a Window
     // Manager client.
     AURA_MUS_WINDOW_MANAGER,
 
     // Indicates AuraInit should target using ui::Window.
     UI
   };
 
-  ~AuraInit();
-
-  // Returns an AuraInit if initialization can be completed successfully,
-  // otherwise a nullptr is returned. If initialization fails then Aura is in an
-  // unusable state, and calling services should shutdown.
   // |resource_file| is the file to load strings and 1x icons from.
   // |resource_file_200| can be an empty string, otherwise it is the file to
   // load 2x icons from.
-  static std::unique_ptr<AuraInit> Create(
-      service_manager::Connector* connector,
-      const service_manager::Identity& identity,
-      const std::string& resource_file,
-      const std::string& resource_file_200 = std::string(),
-      scoped_refptr<base::SingleThreadTaskRunner> io_task_runner = nullptr,
-      Mode mode = Mode::UI);
+  AuraInit(service_manager::Connector* connector,
+           const service_manager::Identity& identity,
+           const std::string& resource_file,
+           const std::string& resource_file_200 = std::string(),
+           scoped_refptr<base::SingleThreadTaskRunner> io_task_runner = nullptr,
+           Mode mode = Mode::UI);
+  ~AuraInit();
 
   // Only valid if Mode::AURA_MUS was passed to constructor.
   MusClient* mus_client() { return mus_client_.get(); }
 
- private:
-  AuraInit();
-
   // Returns true if AuraInit was able to successfully complete initialization.
   // If this returns false, then Aura is in an unusable state, and calling
   // services should shutdown.
-  bool Init(
-      service_manager::Connector* connector,
-      const service_manager::Identity& identity,
-      const std::string& resource_file,
-      const std::string& resource_file_200 = std::string(),
-      scoped_refptr<base::SingleThreadTaskRunner> io_task_runner = nullptr,
-      Mode mode = Mode::UI);
+  bool initialized() { return initialized_; }
 
-  bool InitializeResources(service_manager::Connector* connector,
-                           const std::string& resource_file,
-                           const std::string& resource_file_200);
+ private:
+  bool InitializeResources(service_manager::Connector* connector);
 
 #if defined(OS_LINUX)
   sk_sp<font_service::FontLoader> font_loader_;
 #endif
 
+  const std::string resource_file_;
+  const std::string resource_file_200_;
+
   std::unique_ptr<aura::Env> env_;
   std::unique_ptr<MusClient> mus_client_;
   std::unique_ptr<ViewsDelegate> views_delegate_;
 
+  // Whether or not initialization succeeds.
+  bool initialized_ = false;
+
   DISALLOW_COPY_AND_ASSIGN(AuraInit);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_MUS_AURA_INIT_H_