Landing OEM customization CL for Denis...

chrome/browser/browser_main.cc

 // Copyright (c) 2010 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 "chrome/browser/browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 90 matching lines @@
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <commctrl.h>
 #include <shellapi.h>
 
 #include "app/l10n_util_win.h"
 #include "app/win_util.h"
 #include "base/registry.h"
 #include "base/win_util.h"
-#include "chrome/browser/browser.h"
 #include "chrome/browser/browser_trial.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/rlz/rlz.h"
 #include "chrome/browser/views/user_data_dir_dialog.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/common/sandbox_policy.h"
 #include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/shell_util.h"
@@ skipping 516 matching lines @@
     if (size_arg.size()) {
       std::vector<std::string> dimensions;
       SplitString(size_arg, ',', &dimensions);
       if (dimensions.size() == 2)
         size.SetSize(StringToInt(dimensions[0]), StringToInt(dimensions[1]));
     }
     browser::ShowLoginWizard(first_screen, size);
   }
 }
 
-bool OptionallyApplyServicesCustomizationFromCommandLine(
-    const CommandLine& parsed_command_line,
-    BrowserInit* browser_init) {
-  // For Chrome OS, we may need to fetch OEM partner's services customization
-  // manifest and apply the customizations. This happens on the very first run
-  // or if startup manifest is passed on the command line.
-  scoped_ptr<chromeos::ServicesCustomizationDocument> customization;
-  customization.reset(new chromeos::ServicesCustomizationDocument());
-  bool manifest_loaded = false;
-  if (parsed_command_line.HasSwitch(switches::kServicesManifest)) {
-    // Load manifest from file specified by command line switch.
-    FilePath manifest_path =
-        parsed_command_line.GetSwitchValuePath(switches::kServicesManifest);
-    manifest_loaded = customization->LoadManifestFromFile(manifest_path);
-    DCHECK(manifest_loaded) << manifest_path.value();
-  }
-  // If manifest was loaded successfully, apply the customizations.
-  if (manifest_loaded) {
-    browser_init->ApplyServicesCustomization(customization.get());
-  }
-  return manifest_loaded;
-}
-
 #else
 
 void OptionallyRunChromeOSLoginManager(const CommandLine& parsed_command_line) {
   // Dummy empty function for non-ChromeOS builds to avoid extra ifdefs below.
 }
 
-bool OptionallyApplyServicesCustomizationFromCommandLine(
-    const CommandLine& parsed_command_line,
-    BrowserInit* browser_init) {
-  // Dummy empty function for non-ChromeOS builds to avoid extra ifdefs below.
-  return false;
-}
-
 #endif  // defined(OS_CHROMEOS)
 
 #if defined(OS_MACOSX)
 OSStatus KeychainCallback(SecKeychainEvent keychain_event,
                           SecKeychainCallbackInfo *info, void *context) {
   return noErr;
 }
 #endif
 
 }  // namespace
@@ skipping 426 matching lines @@
 
   // Configure the network module so it has access to resources.
   net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider);
 
   // Register our global network handler for chrome:// and
   // chrome-extension:// URLs.
   RegisterURLRequestChromeJob();
   RegisterExtensionProtocols();
   RegisterMetadataURLRequestHandler();
 
-  // If path to partner services customization document was passed on command
-  // line, apply the customizations (Chrome OS only).
-  // TODO(denisromanov): Remove this when not needed for testing.
-  OptionallyApplyServicesCustomizationFromCommandLine(parsed_command_line,
-                                                      &browser_init);
-
   // In unittest mode, this will do nothing.  In normal mode, this will create
   // the global GoogleURLTracker and IntranetRedirectDetector instances, which
   // will promptly go to sleep for five and seven seconds, respectively (to
   // avoid slowing startup), and wake up afterwards to see if they should do
   // anything else.
   //
   // A simpler way of doing all this would be to have some function which could
   // give the time elapsed since startup, and simply have these objects check
   // that when asked to initialize themselves, but this doesn't seem to exist.
   //
@@ skipping 158 matching lines @@
 
   metrics->Stop();
 
   // browser_shutdown takes care of deleting browser_process, so we need to
   // release it.
   ignore_result(browser_process.release());
   browser_shutdown::Shutdown();
 
   return result_code;
 }