Merge 82987, 83304 - make sure that OEM tab is shown even if first login is Guest

chrome/browser/extensions/extension_info_private_api_chromeos.h

Index: chrome/browser/extensions/extension_info_private_api_chromeos.h
===================================================================
--- chrome/browser/extensions/extension_info_private_api_chromeos.h	(revision 83304)
+++ chrome/browser/extensions/extension_info_private_api_chromeos.h	(working copy)
@@ -7,16 +7,8 @@
 #pragma once
 
 #include <string>
-#include <vector>
-#include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/extension_function.h"
 
-class DictionaryValue;
-
-namespace chromeos {
-class StartupCustomizationDocument;
-}  // namespace chromeos
-
 class GetChromeosInfoFunction : public AsyncExtensionFunction {
  public:
   GetChromeosInfoFunction();
@@ -27,16 +19,8 @@
   virtual bool RunImpl();
 
  private:
-  // This method is called on FILE thread.
-  void LoadValues();
+  bool GetValue(const std::string& property_name, std::string* value);
 
-  // This method is called on UI thread.
-  void RespondOnUIThread();
-
-  scoped_ptr<DictionaryValue> result_dictionary_;
-  std::vector<std::string> properties_;
-  std::vector<std::pair<std::string, std::string> > new_results_;
-
   DECLARE_EXTENSION_FUNCTION_NAME("chromeosInfoPrivate.get");
 };