Fix cases that initialized StringTokenizer with a temporary.

Fix examples in StringTokenizer header that recommended doing that.

BUG=none
TEST=on linux, open options, click proxy configuration button a bunch.  It should not fail intermittently.

Review URL: http://codereview.chromium.org/174490

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24398 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 5 insertions, 2 deletions

diff --git a/chrome/browser/gtk/options/advanced_contents_gtk.cc b/chrome/browser/gtk/options/advanced_contents_gtk.cc
index c50e77c..891fd71 100644
--- a/chrome/browser/gtk/options/advanced_contents_gtk.cc
+++ b/chrome/browser/gtk/options/advanced_contents_gtk.cc
@@ -411,8 +411,10 @@ void NetworkSection::OnChangeProxiesButtonClicked(GtkButton *button,
 bool NetworkSection::SearchPATH(ProxyConfigCommand* commands, size_t ncommands,
                                 size_t* index) {
   const char* path = getenv("PATH");
+  if (!path)
+    return false;
   FilePath bin_path;
-  StringTokenizer tk(path, ":");
+  CStringTokenizer tk(path, path + strlen(path), ":");
   // Search $PATH looking for the commands in order.
   while (tk.GetNext()) {
     for (size_t i = 0; i < ncommands; i++) {
diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc
index 8ecc0da..ea38c57 100644
--- a/chrome/browser/shell_integration_linux.cc
+++ b/chrome/browser/shell_integration_linux.cc
@@ -54,7 +54,8 @@ bool GetDesktopShortcutTemplate(std::string* output) {
 
   const char* xdg_data_dirs = getenv("XDG_DATA_DIRS");
   if (xdg_data_dirs) {
-    StringTokenizer tokenizer(xdg_data_dirs, ":");
+    CStringTokenizer tokenizer(xdg_data_dirs,
+                               xdg_data_dirs + strlen(xdg_data_dirs), ":");
     while (tokenizer.GetNext()) {
       search_paths.push_back(tokenizer.token());
     }