Removed use of IsRunningOnIOS8OrLater from snapshots code.

ios/chrome/browser/snapshots/snapshots_util.mm

 // Copyright 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 "ios/chrome/browser/snapshots/snapshots_util.h"
 
 #import <UIKit/UIKit.h>
 
 #include "base/files/file_util.h"
 #include "base/ios/ios_util.h"
@@ skipping 22 matching lines @@
     web::WebThread::PostBlockingPoolTask(
         FROM_HERE,
         base::Bind(base::IgnoreResult(&base::DeleteFile), snapshotPath, false));
   }
 }
 
 void GetSnapshotsPaths(std::vector<base::FilePath>* snapshotsPaths) {
   DCHECK(snapshotsPaths);
   base::FilePath snapshotsDir;
   PathService::Get(base::DIR_CACHE, &snapshotsDir);
+  // Snapshots are located in a path with the bundle ID used twice.
   snapshotsDir =
       snapshotsDir.Append("Snapshots").Append(base::mac::BaseBundleID());

[sdefresne, 2016/10/19 18:22:27]

nit: (or however "git cl format" format this)

snapshotsDir = snapshotsDir
    .Append("Snapshots")
    .Append(base::mac::BaseBundleID())
    .Append(base::mac::BaseBundleID());

[pkl (ping after 24h if needed), 2016/10/19 20:35:03]

git cl format'ed

-  if (base::ios::IsRunningOnIOS8OrLater()) {
-    // On iOS8, the snapshots are located in a path with the bundle ID used
-    // twice.
-    snapshotsDir = snapshotsDir.Append(base::mac::BaseBundleID());
-  } else {
-    // On iOS7, the snapshots are located in the subfolder "Main".
-    snapshotsDir = snapshotsDir.Append("Main");
-  }
+  snapshotsDir = snapshotsDir.Append(base::mac::BaseBundleID());
   const char* retinaSuffix = "";
   CGFloat scale = [UIScreen mainScreen].scale;
   if (scale == 2) {
     retinaSuffix = "@2x";
   } else if (scale == 3) {
     retinaSuffix = "@3x";
   }
   for (unsigned int i = 0; i < arraysize(kOrientationDescriptions); i++) {
     std::string snapshotFilename =
         base::StringPrintf("UIApplicationAutomaticSnapshotDefault-%s%s.png",
                            kOrientationDescriptions[i], retinaSuffix);
     base::FilePath snapshotPath = snapshotsDir.Append(snapshotFilename);
     snapshotsPaths->push_back(snapshotPath);
   }
 }