Enabling testing Google Now component extension

chrome/browser/chrome_browser_main.cc

 // Copyright (c) 2012 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/chrome_browser_main.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 1038 matching lines @@
 }
 
 void ChromeBrowserMainParts::PostBrowserStart() {
 #if !defined(OS_ANDROID)
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kVisitURLs))
     RunPageCycler();
 #endif
 
   // Create the instance of the Google Now service.
 #if defined(ENABLE_GOOGLE_NOW)
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableGoogleNowIntegration)) {
-    GoogleNowServiceFactory::GetForProfile(profile_);
-  }
+  // TODO(vadim): Remove C++ Google Now implementation.
+  // if (CommandLine::ForCurrentProcess()->HasSwitch(
+  //     switches::kEnableGoogleNowIntegration)) {

[skare_, 2013/03/06 22:08:01]

can this block just be removed altogether, and file a bug against yourself or
similar for tracking? 
I think checking in commented-out code is generally avoided.

[vadimt, 2013/03/06 22:37:12]

This text has 2 parts:

(1) TODO item. TODO's are widely used as lightweight replacement bugs that have
to be cleared before release.

(2) Commented out C++ code.
In this case, we are not 100% sure that we won't have switch back to C++, so we
don't want to lose the code.
On the other hand, we don't want the code to be executed.

So, commenting out the code seems quite adequate.

[skare_, 2013/03/07 00:56:39]

1) consider an actual bug for this case since we'll want to have it happen
before we release.

2) chrome_browser_main is a fairly communal file -- could we just erase this
whole #if block and rely on source control to get the code later?

On 2013/03/06 22:37:12, vadimt wrote:

[vadimt, 2013/03/07 22:33:07]

Removed. We have a TODO item in JS code to remove the remaining C++ code (I
don't think we need to convert all TODO items to bugs).

+  //   GoogleNowServiceFactory::GetForProfile(profile_);
+  // }
 #endif
 
   for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
     chrome_extra_parts_[i]->PostBrowserStart();
 #if !defined(OS_ANDROID)
   // Allow ProcessSingleton to process messages.
   process_singleton_->Unlock();
 #endif
 }
 
@@ skipping 725 matching lines @@
     if (base::win::GetVersion() <= base::win::VERSION_XP)
       uma_name += "_XP";
 
     uma_name += "_PreRead_";
     uma_name += pre_read_percentage;
     AddPreReadHistogramTime(uma_name.c_str(), time);
   }
 #endif
 #endif
 }